Adapt workflows to use previous naming scheme

This commit is contained in:
AsamK 2026-04-22 21:19:25 +02:00
parent 417d2ce971
commit b8d990b0f9
2 changed files with 10 additions and 9 deletions

View File

@ -13,22 +13,22 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
# The "reproducible" entry is used to build the project with the LTS Java version used in reproducible builds script. # java="25" is the LTS Java version used in reproducible builds script (default in Containerfile).
# More Java versions can be added to test compatibility, eg. "26". # More Java versions can be added to test compatibility, eg. "26".
java: ["reproducible", "26"] java: ["25", "26"]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- name: Build - name: Build
run: | run: |
if [ "${{ matrix.java }}" != "reproducible" ]; then if [ "${{ matrix.java }}" != "25" ]; then
export OVERRIDE_JAVA_VERSION="${{ matrix.java }}" export OVERRIDE_JAVA_VERSION="${{ matrix.java }}"
fi fi
./reproducible-builds/build.sh ./reproducible-builds/build.sh
- name: Upload build artifacts - name: Upload build artifacts
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
with: with:
name: signal-cli-${{ matrix.java }}-${{ github.job }} name: signal-cli-archive-${{ matrix.java }}
path: dist/* path: dist/*
build-client: build-client:

View File

@ -12,10 +12,11 @@ env:
IMAGE_REGISTRY: ghcr.io/asamk IMAGE_REGISTRY: ghcr.io/asamk
REGISTRY_USER: ${{ github.actor }} REGISTRY_USER: ${{ github.actor }}
REGISTRY_PASSWORD: ${{ github.token }} REGISTRY_PASSWORD: ${{ github.token }}
ARCHIVE_JAVA_VERSION: 25
jobs: jobs:
build: build:
uses: AsamK/signal-cli/.github/workflows/build.yml@master uses: ./.github/workflows/build.yml
release: release:
needs: build needs: build
@ -31,7 +32,7 @@ jobs:
- name: Get signal-cli version - name: Get signal-cli version
id: version id: version
run: | run: |
mv ./signal-cli-reproducible-build/* . mv ./signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/* .
echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
- name: Create release - name: Create release
@ -87,7 +88,7 @@ jobs:
- name: Move archive file - name: Move archive file
run: | run: |
tar xf ./signal-cli-reproducible-build/signal-cli-${{ needs.release.outputs.version }}.tar.gz tar xf signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/signal-cli-${{ needs.release.outputs.version }}.tar.gz
mkdir -p build/install/ mkdir -p build/install/
mv ./signal-cli-"${{ needs.release.outputs.version }}"/ build/install/signal-cli mv ./signal-cli-"${{ needs.release.outputs.version }}"/ build/install/signal-cli
@ -127,7 +128,7 @@ jobs:
- name: Move archive file - name: Move archive file
run: | run: |
tar xf ./signal-cli-reproducible-build/signal-cli-${{ needs.release.outputs.version }}-Linux-native.tar.gz tar xf signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/signal-cli-${{ needs.release.outputs.version }}-Linux-native.tar.gz
mkdir -p build/native/nativeCompile/ mkdir -p build/native/nativeCompile/
mv signal-cli build/native/nativeCompile/ mv signal-cli build/native/nativeCompile/
chmod +x build/native/nativeCompile/signal-cli chmod +x build/native/nativeCompile/signal-cli
@ -168,7 +169,7 @@ jobs:
- name: Move archive file - name: Move archive file
run: | run: |
tar xf ./signal-cli-reproducible-build/signal-cli-${{ needs.release.outputs.version }}-Linux-client.tar.gz tar xf signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/signal-cli-${{ needs.release.outputs.version }}-Linux-client.tar.gz
mkdir -p client/target/release/ mkdir -p client/target/release/
mv signal-cli-client client/target/release/ mv signal-cli-client client/target/release/
chmod +x client/target/release/signal-cli-client chmod +x client/target/release/signal-cli-client