Compare commits

..

No commits in common. "5bdd4e21b0e9d767045bc24d9875786a7fba2478" and "5f6366078cc0e608f7fd16a33d95e7bc3ec09863" have entirely different histories.

7 changed files with 39 additions and 43 deletions

View File

@ -3,15 +3,11 @@ matrix:
- 'linux/amd64' - 'linux/amd64'
# - linux/arm64 # - linux/arm64
labels: platform: ${PLATFORM}
platform: ${PLATFORM} branches: [ main ]
when:
event: tag
skip_clone: true skip_clone: true
steps: pipeline:
build: build:
image: 'menci/archlinuxarm:base-devel' image: 'menci/archlinuxarm:base-devel'
pull: true pull: true
@ -27,6 +23,8 @@ steps:
- su builder - su builder
- curl -OL "https://git.rustybever.be/Chewing_Bever/alex/raw/tag/$CI_COMMIT_TAG/PKGBUILD" - curl -OL "https://git.rustybever.be/Chewing_Bever/alex/raw/tag/$CI_COMMIT_TAG/PKGBUILD"
- makepkg -s --noconfirm --needed - makepkg -s --noconfirm --needed
when:
event: tag
publish: publish:
image: 'curlimages/curl' 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' - '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: secrets:
- vieter_api_key - vieter_api_key
when:
event: tag

View File

@ -3,20 +3,19 @@ matrix:
- 'amd64' - 'amd64'
- 'arm64' - 'arm64'
labels: platform: "linux/${ARCH}"
platform: "linux/${ARCH}"
when: branches:
branch: exclude: [main]
exclude: [main]
event: push
steps: pipeline:
build: build:
image: 'rust:1.71-alpine3.18' image: 'rust:1.70-alpine3.18'
commands: commands:
- apk add --no-cache build-base - apk add --no-cache build-base
- cargo build --verbose - cargo build --verbose
- cargo test --verbose - cargo test --verbose
# Binaries, even debug ones, should be statically compiled # Binaries, even debug ones, should be statically compiled
- '[ "$(readelf -d target/debug/alex | grep NEEDED | wc -l)" = 0 ]' - '[ "$(readelf -d target/debug/alex | grep NEEDED | wc -l)" = 0 ]'
when:
event: [push]

View File

@ -1,14 +1,13 @@
labels: platform: 'linux/amd64'
platform: 'linux/amd64'
when: branches:
branch: exclude: [main]
exclude: [ main ]
event: push
steps: pipeline:
clippy: clippy:
image: 'rust:1.71' image: 'rust:1.70'
commands: commands:
- rustup component add clippy - rustup component add clippy
- cargo clippy -- --no-deps -Dwarnings - cargo clippy -- --no-deps -Dwarnings
when:
event: [push]

View File

@ -1,14 +1,13 @@
labels: platform: 'linux/amd64'
platform: 'linux/amd64'
when: branches:
branch: exclude: [main]
exclude: [ main ]
event: push
steps: pipeline:
lint: lint:
image: 'rust:1.71' image: 'rust:1.70'
commands: commands:
- rustup component add rustfmt - rustup component add rustfmt
- cargo fmt -- --check - cargo fmt -- --check
when:
event: [push]

View File

@ -3,21 +3,20 @@ matrix:
- 'linux/amd64' - 'linux/amd64'
- 'linux/arm64' - 'linux/arm64'
labels: platform: ${PLATFORM}
platform: ${PLATFORM} branches: [ main ]
when: pipeline:
event: tag
steps:
build: build:
image: 'rust:1.71-alpine3.18' image: 'rust:1.70-alpine3.18'
commands: commands:
- apk add --no-cache build-base - apk add --no-cache build-base
- cargo build --release --verbose - cargo build --release --verbose
# Ensure the release binary is also statically compiled # Ensure the release binary is also statically compiled
- '[ "$(readelf -d target/release/alex | grep NEEDED | wc -l)" = 0 ]' - '[ "$(readelf -d target/release/alex | grep NEEDED | wc -l)" = 0 ]'
- du -h target/release/alex - du -h target/release/alex
when:
event: tag
publish: publish:
image: 'curlimages/curl' image: 'curlimages/curl'
@ -29,3 +28,5 @@ steps:
--user "Chewing_Bever:$GITEA_PASSWORD" --user "Chewing_Bever:$GITEA_PASSWORD"
--upload-file target/release/alex --upload-file target/release/alex
https://git.rustybever.be/api/packages/Chewing_Bever/generic/alex/"${CI_COMMIT_TAG}"/alex-"$(echo '${PLATFORM}' | sed 's:/:-:g')" https://git.rustybever.be/api/packages/Chewing_Bever/generic/alex/"${CI_COMMIT_TAG}"/alex-"$(echo '${PLATFORM}' | sed 's:/:-:g')"
when:
event: tag

View File

@ -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 * Export command no longer reads backups that do not contribute to the final
state state
* Running backups no longer block stdin input or shutdown * 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) ## [0.3.1](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.3.1)

View File

@ -47,9 +47,9 @@ COPY --from=builder /app/target/debug/alex /bin/alex
RUN chmod +x /bin/alex RUN chmod +x /bin/alex
# Default value to keep users from eating up all ram accidentally # Default value to keep users from eating up all ram accidentally
ENV ALEX_CONFIG=/app/config \ ENV ALEX_CONFIG_DIR=/app/config \
ALEX_WORLD=/app/worlds \ ALEX_WORLD_DIR=/app/worlds \
ALEX_BACKUP=/app/backups \ ALEX_BACKUP_DIR=/app/backups \
ALEX_SERVER=paper \ ALEX_SERVER=paper \
ALEX_XMS=1024 \ ALEX_XMS=1024 \
ALEX_XMX=2048 \ ALEX_XMX=2048 \