Skip to content

Commit 5d3e8fd

Browse files
dmcgowandmcgowan
authored
Merge pull request containerd#5144 from devholic/release-non-cni-version
Update release workflow to upload binary without CNI
2 parents a3e431a + d62d6c1 commit 5d3e8fd

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎.github/workflows/release.yml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -139,40 +139,28 @@ jobs:
139139
sudo apt-get install -y gperf
140140
sudo -E PATH=$PATH script/setup/install-seccomp
141141
fi
142-
make cri-cni-release
142+
make cri-release cri-cni-release
143143
working-directory: src/github.com/containerd/containerd
144144

145145
- name: Save cri-containerd binaries
146146
uses: actions/upload-artifact@v2
147147
with:
148148
name: cri-containerd-binaries-${{ matrix.os }}
149-
path: src/github.com/containerd/containerd/releases/cri-containerd-cni-*.tar.gz*
149+
path: src/github.com/containerd/containerd/releases/cri-containerd-*.tar.gz*
150150

151151
release:
152152
name: Create containerd Release
153153
runs-on: ubuntu-18.04
154154
timeout-minutes: 10
155155
needs: [build, check]
156+
outputs:
157+
upload_url: ${{ steps.create_release.outputs.upload_url }}
156158

157159
steps:
158160
- name: Download builds and release notes
159161
uses: actions/download-artifact@v2
160162
with:
161163
path: builds
162-
- name: Catalog build assets for upload
163-
id: catalog
164-
run: |
165-
_filenum=1
166-
for i in "ubuntu-18.04" "windows-2019"; do
167-
for f in `ls builds/containerd-binaries-${i}`; do
168-
echo "::set-output name=file${_filenum}::${f}"
169-
let "_filenum+=1"
170-
done
171-
for f in `ls builds/cri-containerd-binaries-${i}`; do
172-
echo "::set-output name=file${_filenum}::${f}"
173-
let "_filenum+=1"
174-
done
175-
done
176164
- name: Create Release
177165
id: create_release
178166
uses: actions/create-release@v1.1.2
@@ -184,75 +172,87 @@ jobs:
184172
body_path: ./builds/containerd-release-notes/release-notes.md
185173
draft: false
186174
prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
187-
- name: Upload Linux containerd tarball
175+
176+
release-upload:
177+
name: Upload containerd tarballs
178+
runs-on: ubuntu-18.04
179+
timeout-minutes: 10
180+
needs: [release]
181+
182+
strategy:
183+
matrix:
184+
os: [ubuntu-18.04, windows-2019]
185+
186+
steps:
187+
- name: Download builds and release notes
188+
uses: actions/download-artifact@v2
189+
with:
190+
path: builds
191+
- name: Catalog build assets for upload
192+
id: catalog
193+
env:
194+
OS: ${{ matrix.os }}
195+
run: |
196+
_filenum=1
197+
for f in `ls "builds/containerd-binaries-${OS}"`; do
198+
echo "::set-output name=file${_filenum}::${f}"
199+
let "_filenum+=1"
200+
done
201+
for f in `ls builds/cri-containerd-binaries-${OS}`; do
202+
echo "::set-output name=file${_filenum}::${f}"
203+
let "_filenum+=1"
204+
done
205+
- name: Upload containerd tarball
188206
uses: actions/upload-release-asset@v1
189207
env:
190208
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
191209
with:
192-
upload_url: ${{ steps.create_release.outputs.upload_url }}
193-
asset_path: ./builds/containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file1 }}
210+
upload_url: ${{ needs.release.outputs.upload_url }}
211+
asset_path: ./builds/containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file1 }}
194212
asset_name: ${{ steps.catalog.outputs.file1 }}
195213
asset_content_type: application/gzip
196-
- name: Upload Linux sha256 sum
214+
- name: Upload sha256 sum
197215
uses: actions/upload-release-asset@v1
198216
env:
199217
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
200218
with:
201-
upload_url: ${{ steps.create_release.outputs.upload_url }}
202-
asset_path: ./builds/containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file2 }}
219+
upload_url: ${{ needs.release.outputs.upload_url }}
220+
asset_path: ./builds/containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file2 }}
203221
asset_name: ${{ steps.catalog.outputs.file2 }}
204222
asset_content_type: text/plain
205-
- name: Upload Linux cri containerd tarball
223+
- name: Upload cri containerd tarball
206224
uses: actions/upload-release-asset@v1
207225
env:
208226
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
209227
with:
210-
upload_url: ${{ steps.create_release.outputs.upload_url }}
211-
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file3 }}
228+
upload_url: ${{ needs.release.outputs.upload_url }}
229+
asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file3 }}
212230
asset_name: ${{ steps.catalog.outputs.file3 }}
213231
asset_content_type: application/gzip
214-
- name: Upload Linux cri sha256 sum
232+
- name: Upload cri sha256 sum
215233
uses: actions/upload-release-asset@v1
216234
env:
217235
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
218236
with:
219-
upload_url: ${{ steps.create_release.outputs.upload_url }}
220-
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file4 }}
237+
upload_url: ${{ needs.release.outputs.upload_url }}
238+
asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file4 }}
221239
asset_name: ${{ steps.catalog.outputs.file4 }}
222240
asset_content_type: text/plain
223-
- name: Upload Windows containerd tarball
241+
- name: Upload cri/cni containerd tarball
224242
uses: actions/upload-release-asset@v1
225243
env:
226244
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
227245
with:
228-
upload_url: ${{ steps.create_release.outputs.upload_url }}
229-
asset_path: ./builds/containerd-binaries-windows-2019/${{ steps.catalog.outputs.file5 }}
246+
upload_url: ${{ needs.release.outputs.upload_url }}
247+
asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file5 }}
230248
asset_name: ${{ steps.catalog.outputs.file5 }}
231249
asset_content_type: application/gzip
232-
- name: Upload Windows sha256 sum
250+
- name: Upload cri/cni sha256 sum
233251
uses: actions/upload-release-asset@v1
234252
env:
235253
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
236254
with:
237-
upload_url: ${{ steps.create_release.outputs.upload_url }}
238-
asset_path: ./builds/containerd-binaries-windows-2019/${{ steps.catalog.outputs.file6 }}
255+
upload_url: ${{ needs.release.outputs.upload_url }}
256+
asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file6 }}
239257
asset_name: ${{ steps.catalog.outputs.file6 }}
240258
asset_content_type: text/plain
241-
- name: Upload Windows cri containerd tarball
242-
uses: actions/upload-release-asset@v1
243-
env:
244-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
245-
with:
246-
upload_url: ${{ steps.create_release.outputs.upload_url }}
247-
asset_path: ./builds/cri-containerd-binaries-windows-2019/${{ steps.catalog.outputs.file7 }}
248-
asset_name: ${{ steps.catalog.outputs.file7 }}
249-
asset_content_type: application/gzip
250-
- name: Upload Windows cri sha256 sum
251-
uses: actions/upload-release-asset@v1
252-
env:
253-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
254-
with:
255-
upload_url: ${{ steps.create_release.outputs.upload_url }}
256-
asset_path: ./builds/cri-containerd-binaries-windows-2019/${{ steps.catalog.outputs.file8 }}
257-
asset_name: ${{ steps.catalog.outputs.file8 }}
258-
asset_content_type: text/plain

0 commit comments

Comments
 (0)