Skip to content

Commit

Permalink
Renamed ill-named linux binaries to "linux" (was "unix").
Browse files Browse the repository at this point in the history
(fixed missing renames in GH actions)
  • Loading branch information
hendriks73 committed Aug 1, 2023
1 parent b717acc commit a14fdcd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:

- name: Build/test code with Maven
run: |
mvn --activate-profiles ffsampledsp-${{ matrix.jarch }}-unix \
mvn --activate-profiles ffsampledsp-${{ matrix.jarch }}-linux \
--no-transfer-progress \
--batch-mode \
--file pom.xml \
Expand All @@ -160,4 +160,4 @@ jobs:
- name: Print lib dir
if: always()
run: ls -la ffsampledsp-${{ matrix.jarch }}-unix/target/lib
run: ls -la ffsampledsp-${{ matrix.jarch }}-linux/target/lib
24 changes: 12 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,12 @@ jobs:
cache: 'maven'

- name: Build/test code with Maven
run: mvn --activate-profiles ffsampledsp-x86_64-unix --no-transfer-progress --batch-mode install --file pom.xml
run: mvn --activate-profiles ffsampledsp-x86_64-linux --no-transfer-progress --batch-mode install --file pom.xml

- run: mkdir nativelibs && cp ffsampledsp-x86_64-unix/target/*.so nativelibs
- run: mkdir nativelibs && cp ffsampledsp-x86_64-linux/target/*.so nativelibs
- uses: actions/upload-artifact@v2
with:
name: nativelibs-x86-unix
name: nativelibs-x86-linux
path: nativelibs
retention-days: 1

Expand All @@ -196,11 +196,11 @@ jobs:
GPG_TTY: $(tty)
run: |
mvn \
--projects ffsampledsp-x86_64-unix \
--projects ffsampledsp-x86_64-linux \
--no-transfer-progress \
--batch-mode \
-Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
--activate-profiles release,ffsampledsp-x86_64-unix \
--activate-profiles release,ffsampledsp-x86_64-linux \
--file pom.xml \
deploy
Expand Down Expand Up @@ -238,12 +238,12 @@ jobs:
cache: 'maven'

- name: Build/test code with Maven (no tests for now)
run: mvn --activate-profiles ffsampledsp-aarch64-unix --no-transfer-progress --batch-mode install -Dmaven.test.skip=true --file pom.xml
run: mvn --activate-profiles ffsampledsp-aarch64-linux --no-transfer-progress --batch-mode install -Dmaven.test.skip=true --file pom.xml

- run: mkdir nativelibs && cp ffsampledsp-aarch64-unix/target/*.so nativelibs
- run: mkdir nativelibs && cp ffsampledsp-aarch64-linux/target/*.so nativelibs
- uses: actions/upload-artifact@v2
with:
name: nativelibs-aarch64-unix
name: nativelibs-aarch64-linux
path: nativelibs
retention-days: 1

Expand All @@ -255,11 +255,11 @@ jobs:
GPG_TTY: $(tty)
run: |
mvn \
--projects ffsampledsp-aarch64-unix \
--projects ffsampledsp-aarch64-linux \
--no-transfer-progress \
--batch-mode \
-Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
--activate-profiles release,ffsampledsp-aarch64-unix \
--activate-profiles release,ffsampledsp-aarch64-linux \
--file pom.xml \
deploy \
-Dmaven.test.skip=true
Expand Down Expand Up @@ -367,13 +367,13 @@ jobs:
- name: Get Linux x86 native lib
uses: actions/download-artifact@v2
with:
name: nativelibs-x86-unix
name: nativelibs-x86-linux
path: ffsampledsp-complete/target/classes/

- name: Get Linux arm64 native lib
uses: actions/download-artifact@v2
with:
name: nativelibs-aarch64-unix
name: nativelibs-aarch64-linux
path: ffsampledsp-complete/target/classes/

- name: Get macOS aarch64 native lib
Expand Down

0 comments on commit a14fdcd

Please sign in to comment.