diff --git a/.woodpecker/arch-release.yml b/.woodpecker/arch-release.yml index 1bd073f..ece2c52 100644 --- a/.woodpecker/arch-release.yml +++ b/.woodpecker/arch-release.yml @@ -3,15 +3,11 @@ matrix: - 'linux/amd64' # - linux/arm64 -labels: - platform: ${PLATFORM} - -when: - event: tag - +platform: ${PLATFORM} +branches: [ main ] skip_clone: true -steps: +pipeline: build: image: 'menci/archlinuxarm:base-devel' pull: true @@ -27,6 +23,8 @@ steps: - su builder - curl -OL "https://git.rustybever.be/Chewing_Bever/alex/raw/tag/$CI_COMMIT_TAG/PKGBUILD" - makepkg -s --noconfirm --needed + when: + event: tag publish: image: 'curlimages/curl' @@ -35,3 +33,5 @@ steps: - 'for pkg in $(ls -1 *.pkg*); do curl -XPOST -T "$pkg" -H "X-API-KEY: $VIETER_API_KEY" https://arch.r8r.be/bur/publish; done' secrets: - vieter_api_key + when: + event: tag diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 768e2c8..a1722be 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -3,20 +3,19 @@ matrix: - 'amd64' - 'arm64' -labels: - platform: "linux/${ARCH}" +platform: "linux/${ARCH}" -when: - branch: - exclude: [main] - event: push +branches: + exclude: [main] -steps: +pipeline: build: - image: 'rust:1.71-alpine3.18' + image: 'rust:1.70-alpine3.18' commands: - apk add --no-cache build-base - cargo build --verbose - cargo test --verbose # Binaries, even debug ones, should be statically compiled - '[ "$(readelf -d target/debug/alex | grep NEEDED | wc -l)" = 0 ]' + when: + event: [push] diff --git a/.woodpecker/clippy.yml b/.woodpecker/clippy.yml index 5f23363..61b150d 100644 --- a/.woodpecker/clippy.yml +++ b/.woodpecker/clippy.yml @@ -1,14 +1,13 @@ -labels: - platform: 'linux/amd64' +platform: 'linux/amd64' -when: - branch: - exclude: [ main ] - event: push +branches: + exclude: [main] -steps: +pipeline: clippy: - image: 'rust:1.71' + image: 'rust:1.70' commands: - rustup component add clippy - cargo clippy -- --no-deps -Dwarnings + when: + event: [push] diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index 15e45dc..b74d26d 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -1,14 +1,13 @@ -labels: - platform: 'linux/amd64' +platform: 'linux/amd64' -when: - branch: - exclude: [ main ] - event: push +branches: + exclude: [main] -steps: +pipeline: lint: - image: 'rust:1.71' + image: 'rust:1.70' commands: - rustup component add rustfmt - cargo fmt -- --check + when: + event: [push] diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml index 892dced..f7d44db 100644 --- a/.woodpecker/release.yml +++ b/.woodpecker/release.yml @@ -3,21 +3,20 @@ matrix: - 'linux/amd64' - 'linux/arm64' -labels: - platform: ${PLATFORM} +platform: ${PLATFORM} +branches: [ main ] -when: - event: tag - -steps: +pipeline: build: - image: 'rust:1.71-alpine3.18' + image: 'rust:1.70-alpine3.18' commands: - apk add --no-cache build-base - cargo build --release --verbose # Ensure the release binary is also statically compiled - '[ "$(readelf -d target/release/alex | grep NEEDED | wc -l)" = 0 ]' - du -h target/release/alex + when: + event: tag publish: image: 'curlimages/curl' @@ -29,3 +28,5 @@ steps: --user "Chewing_Bever:$GITEA_PASSWORD" --upload-file target/release/alex https://git.rustybever.be/api/packages/Chewing_Bever/generic/alex/"${CI_COMMIT_TAG}"/alex-"$(echo '${PLATFORM}' | sed 's:/:-:g')" + when: + event: tag diff --git a/CHANGELOG.md b/CHANGELOG.md index 652c541..e2e02ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,8 +18,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Export command no longer reads backups that do not contribute to the final state * Running backups no longer block stdin input or shutdown -* Env vars `ALEX_CONFIG_DIR`, `ALEX_WORLD_DIR` and `ALEX_BACKUP_DIR` renamed to - `ALEX_CONFIG`, `ALEX_WORLD` and `ALEX_BACKUP` respectively ## [0.3.1](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.3.1) diff --git a/Dockerfile b/Dockerfile index 819cbf2..7c63117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,9 +47,9 @@ COPY --from=builder /app/target/debug/alex /bin/alex RUN chmod +x /bin/alex # Default value to keep users from eating up all ram accidentally -ENV ALEX_CONFIG=/app/config \ - ALEX_WORLD=/app/worlds \ - ALEX_BACKUP=/app/backups \ +ENV ALEX_CONFIG_DIR=/app/config \ + ALEX_WORLD_DIR=/app/worlds \ + ALEX_BACKUP_DIR=/app/backups \ ALEX_SERVER=paper \ ALEX_XMS=1024 \ ALEX_XMX=2048 \