Skip to content

Commit b6c8dec

Browse files
committed
Merge branch 'main' into pre-production
2 parents 267f564 + fad10c8 commit b6c8dec

File tree

11 files changed

+318
-149
lines changed

11 files changed

+318
-149
lines changed

.github/workflows/nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ jobs:
4747
branch: origin/main
4848

4949
- name: compress archive
50-
run: 7z a FluCoMa-PD-Windows-nightly.zip FluidCorpusManipulation
50+
run: 7z a FluCoMa-PD-Windows-x64-nightly.zip FluidCorpusManipulation
5151
working-directory: release-packaging
5252

5353
- uses: actions/[email protected]
5454
with:
5555
name: winbuild
56-
path: release-packaging/FluCoMa-PD-Windows-nightly.zip
56+
path: release-packaging/FluCoMa-PD-Windows-x64-nightly.zip
5757

5858
linuxbuild:
59-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-22.04
6060
steps:
6161
- uses: actions/checkout@v3
6262
- uses: flucoma/actions/env@main
@@ -65,16 +65,16 @@ jobs:
6565
branch: origin/main
6666

6767
- name: compress archive
68-
run: tar -zcvf FluCoMa-PD-Linux-nightly.tar.gz FluidCorpusManipulation
68+
run: tar -zcvf FluCoMa-PD-Linux-x64-nightly.tar.gz FluidCorpusManipulation
6969
working-directory: release-packaging
7070

7171
- uses: actions/[email protected]
7272
with:
7373
name: linuxbuild
74-
path: release-packaging/FluCoMa-PD-Linux-nightly.tar.gz
74+
path: release-packaging/FluCoMa-PD-Linux-x64-nightly.tar.gz
7575

7676
release:
77-
runs-on: ubuntu-20.04
77+
runs-on: ubuntu-22.04
7878
needs: [macbuild, winbuild, linuxbuild]
7979

8080
steps:

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ jobs:
4040
branch: origin/${{ github.ref_name }}
4141

4242
- name: compress archive
43-
run: 7z a FluCoMa-PD-Windows.zip FluidCorpusManipulation
43+
run: 7z a FluCoMa-PD-Windows-x64.zip FluidCorpusManipulation
4444
working-directory: release-packaging
4545

4646
- uses: actions/[email protected]
4747
with:
4848
name: winbuild
49-
path: release-packaging/FluCoMa-PD-Windows.zip
49+
path: release-packaging/FluCoMa-PD-Windows-x64.zip
5050

5151
linuxbuild:
52-
runs-on: ubuntu-20.04
52+
runs-on: ubuntu-22.04
5353
outputs:
5454
version: ${{ steps.get-version.outputs.version }}
5555
steps:
@@ -60,20 +60,20 @@ jobs:
6060
branch: origin/${{ github.ref_name }}
6161

6262
- name: compress archive
63-
run: tar -zcvf FluCoMa-PD-Linux.tar.gz FluidCorpusManipulation
63+
run: tar -zcvf FluCoMa-PD-Linux-x64.tar.gz FluidCorpusManipulation
6464
working-directory: release-packaging
6565

6666
- uses: actions/[email protected]
6767
with:
6868
name: linuxbuild
69-
path: release-packaging/FluCoMa-PD-Linux.tar.gz
69+
path: release-packaging/FluCoMa-PD-Linux-x64.tar.gz
7070

7171
- id: get-version
7272
run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT
7373
working-directory: build/_deps/flucoma-core-src
7474

7575
release:
76-
runs-on: ubuntu-20.04
76+
runs-on: ubuntu-22.04
7777
needs: [macbuild, winbuild, linuxbuild]
7878

7979
steps:

0 commit comments

Comments
 (0)