Skip to content

Commit f1cf225

Browse files
committed
CI: update builds.yml to use latest versions for upload-artifact and checkout.
Annoyingly, the new `upload-artifact` requires a new step to merge the outputs in a single package.
1 parent 2d9301d commit f1cf225

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

.github/workflows/builds.yml

+23-13
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
./build/build_linux_x64.sh
3535
ls -lR lib
3636
- name: 'Upload artifacts'
37-
uses: "actions/upload-artifact@v3"
37+
uses: "actions/upload-artifact@v4"
3838
#if: github.event_name == 'release' && github.event.action == 'created'
3939
with:
40-
name: 'development-build'
40+
name: 'development-build-linux_x64'
4141
path: '${{ github.workspace }}/dss_capi/release/*.tar.gz'
4242

4343
build_linux_x86:
@@ -68,17 +68,17 @@ jobs:
6868
docker run -e DSS_CAPI_VERSION -v "${PWD}/..:/build" $DOCKER_IMAGE bash -c 'cd /build/dss_capi; PATH=/opt/python/cp38-cp38/bin/:$PATH bash build/build_linux_x86.sh'
6969
ls -lR lib
7070
- name: 'Upload artifacts'
71-
uses: "actions/upload-artifact@v3"
71+
uses: "actions/upload-artifact@v4"
7272
#if: github.event_name == 'release' && github.event.action == 'created'
7373
with:
74-
name: 'development-build'
74+
name: 'development-build-linux_x86'
7575
path: '${{ github.workspace }}/dss_capi/release/*.tar.gz'
7676

7777
build_macos_x64:
7878
name: 'macOS x64 and ARM64'
7979
runs-on: macos-latest
8080
steps:
81-
- uses: actions/checkout@v3
81+
- uses: "actions/checkout@v4"
8282
with:
8383
fetch-depth: 0
8484
path: 'dss_capi'
@@ -109,10 +109,10 @@ jobs:
109109
./build/build_macos_arm64.sh
110110
ls -lR lib
111111
- name: 'Upload artifacts'
112-
uses: "actions/upload-artifact@v3"
112+
uses: "actions/upload-artifact@v4"
113113
#if: github.event_name == 'release' && github.event.action == 'created'
114114
with:
115-
name: 'development-build'
115+
name: 'development-build-darwin'
116116
path: '${{ github.workspace }}/dss_capi/release/*.tar.gz'
117117

118118
build_win_x64:
@@ -121,7 +121,7 @@ jobs:
121121
env:
122122
DSS_CAPI_BUILD_ODDIE: '1'
123123
steps:
124-
- uses: actions/checkout@v3
124+
- uses: "actions/checkout@v4"
125125
with:
126126
fetch-depth: 0
127127
path: 'dss_capi'
@@ -151,17 +151,17 @@ jobs:
151151
call build/generated/set_version.bat
152152
call build/build_win_x64.bat
153153
- name: 'Upload artifacts'
154-
uses: "actions/upload-artifact@v3"
154+
uses: "actions/upload-artifact@v4"
155155
#if: github.event_name == 'release' && github.event.action == 'created'
156156
with:
157-
name: 'development-build'
157+
name: 'development-build-win_x64'
158158
path: '${{ github.workspace }}/dss_capi/release/*.zip'
159159

160160
build_win:
161161
name: 'Windows x86'
162162
runs-on: windows-2019
163163
steps:
164-
- uses: actions/checkout@v3
164+
- uses: "actions/checkout@v4"
165165
with:
166166
fetch-depth: 0
167167
path: 'dss_capi'
@@ -189,8 +189,18 @@ jobs:
189189
call build/generated/set_version.bat
190190
call build/build_win_x86.bat
191191
- name: 'Upload artifacts'
192-
uses: "actions/upload-artifact@v3"
192+
uses: "actions/upload-artifact@v4"
193193
#if: github.event_name == 'release' && github.event.action == 'created'
194194
with:
195-
name: 'development-build'
195+
name: 'development-build-win_x86'
196196
path: '${{ github.workspace }}/dss_capi/release/*.zip'
197+
198+
merge:
199+
runs-on: ubuntu-latest
200+
needs: [build_linux_x64, build_linux_x86, build_macos_x64, build_win_x64, build_win]
201+
steps:
202+
- name: Merge Artifacts
203+
uses: actions/upload-artifact/merge@v4
204+
with:
205+
name: development-build
206+
pattern: development-build-*

0 commit comments

Comments
 (0)