Skip to content

Commit 5d2e8e8

Browse files
dmcgowandmcgowan
committed
Revert "Release artifacts for Linux ARM64"
This reverts commit cdd0758. Signed-off-by: Derek McGowan <derek@mcg.dev>
1 parent 7942ae6 commit 5d2e8e8

File tree

1 file changed

+24
-101
lines changed

1 file changed

+24
-101
lines changed

‎.github/workflows/release.yml‎

Lines changed: 24 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,7 @@ jobs:
5656

5757
strategy:
5858
matrix:
59-
include:
60-
- os: ubuntu-18.04
61-
arch: amd64
62-
- os: ubuntu-18.04
63-
arch: arm64
64-
- os: windows-2019
65-
arch: amd64
59+
os: [ubuntu-18.04, windows-2019]
6660

6761
steps:
6862
- name: Install Go
@@ -74,7 +68,6 @@ jobs:
7468
shell: bash
7569
env:
7670
MOS: ${{ matrix.os }}
77-
MARCH: ${{ matrix.arch }}
7871
run: |
7972
releasever=${{ github.ref }}
8073
releasever="${releasever#refs/tags/}"
@@ -84,43 +77,9 @@ jobs:
8477
}
8578
echo "RELEASE_VER=${releasever}" >> $GITHUB_ENV
8679
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
87-
echo "GOOS=${os}" >> $GITHUB_ENV
88-
echo "GOARCH=${{ matrix.arch }}" >> $GITHUB_ENV
89-
[[ "${MARCH}" == "arm64" ]] && {
90-
echo "CGO_ENABLED=1" >> $GITHUB_ENV
91-
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
92-
}
80+
echo "OS=${os}" >> $GITHUB_ENV
9381
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
9482
95-
- name: Install dependencies
96-
if: ${{ runner.os == 'Linux' }}
97-
shell: bash
98-
run: |
99-
if [[ "${GOARCH}" != "amd64" ]]; then
100-
sudo add-apt-repository "deb [arch=arm64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -sc) main" || true
101-
sudo add-apt-repository "deb [arch=arm64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -sc)-updates main" || true
102-
103-
sudo dpkg --add-architecture arm64
104-
sudo dpkg --add-architecture s390x
105-
sudo dpkg --add-architecture ppc64el
106-
107-
sudo apt-get update || true
108-
109-
sudo apt-get install -y \
110-
crossbuild-essential-arm64 \
111-
crossbuild-essential-s390x \
112-
crossbuild-essential-ppc64el \
113-
libseccomp-dev:amd64 \
114-
libseccomp-dev:arm64 \
115-
libseccomp-dev:s390x \
116-
libseccomp-dev:ppc64el
117-
# libbtrfs-dev is not available for Ubuntu 18.04
118-
# libbtrfs-dev:amd64 \
119-
# libbtrfs-dev:arm64 \
120-
# libbtrfs-dev:s390x \
121-
# libbtrfs-dev:ppc64el
122-
fi
123-
12483
- name: Checkout containerd
12584
uses: actions/checkout@v2
12685
with:
@@ -149,30 +108,30 @@ jobs:
149108
make build
150109
make binaries
151110
rm bin/containerd-stress*
152-
[[ "${GOOS}" == "windows" ]] && {
111+
[[ "${OS}" == "windows" ]] && {
153112
(
154113
bindir="$(pwd)/bin"
155114
cd ../../Microsoft/hcsshim
156115
GO111MODULE=on go build -mod=vendor -o "${bindir}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
157116
)
158117
}
159-
TARFILE="containerd-${RELEASE_VER#v}-${GOOS}-${GOARCH}.tar.gz"
118+
TARFILE="containerd-${RELEASE_VER#v}-${OS}-amd64.tar.gz"
160119
tar czf ${TARFILE} bin/
161120
sha256sum ${TARFILE} >${TARFILE}.sha256sum
162121
working-directory: src/github.com/containerd/containerd
163122

164123
- name: Save build binaries
165124
uses: actions/upload-artifact@v2
166125
with:
167-
name: containerd-binaries-${{ matrix.os }}-${{ matrix.arch }}
126+
name: containerd-binaries-${{ matrix.os }}
168127
path: src/github.com/containerd/containerd/*.tar.gz*
169128

170129
- name: Make cri-containerd tar
171130
shell: bash
172131
env:
173132
RUNC_FLAVOR: runc
174133
run: |
175-
if [[ "${GOOS}" == "linux" ]]; then
134+
if [[ "${OS}" == "linux" ]]; then
176135
sudo -E PATH=$PATH script/setup/install-seccomp
177136
fi
178137
make cri-cni-release
@@ -181,7 +140,7 @@ jobs:
181140
- name: Save cri-containerd binaries
182141
uses: actions/upload-artifact@v2
183142
with:
184-
name: cri-containerd-binaries-${{ matrix.os }}-${{ matrix.arch }}
143+
name: cri-containerd-binaries-${{ matrix.os }}
185144
path: src/github.com/containerd/containerd/releases/cri-containerd-cni-*.tar.gz*
186145

187146
release:
@@ -199,7 +158,7 @@ jobs:
199158
id: catalog
200159
run: |
201160
_filenum=1
202-
for i in "ubuntu-18.04-amd64" "ubuntu-18.04-arm64" "windows-2019-amd64"; do
161+
for i in "ubuntu-18.04" "windows-2019"; do
203162
for f in `ls builds/containerd-binaries-${i}`; do
204163
echo "::set-output name=file${_filenum}::${f}"
205164
let "_filenum+=1"
@@ -220,111 +179,75 @@ jobs:
220179
body_path: ./builds/containerd-release-notes/release-notes.md
221180
draft: false
222181
prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
223-
- name: Upload Linux AMD64 containerd tarball
182+
- name: Upload Linux containerd tarball
224183
uses: actions/upload-release-asset@v1
225184
env:
226185
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
227186
with:
228187
upload_url: ${{ steps.create_release.outputs.upload_url }}
229-
asset_path: ./builds/containerd-binaries-ubuntu-18.04-amd64/${{ steps.catalog.outputs.file1 }}
188+
asset_path: ./builds/containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file1 }}
230189
asset_name: ${{ steps.catalog.outputs.file1 }}
231190
asset_content_type: application/gzip
232-
- name: Upload Linux AMD64 sha256 sum
191+
- name: Upload Linux sha256 sum
233192
uses: actions/upload-release-asset@v1
234193
env:
235194
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
236195
with:
237196
upload_url: ${{ steps.create_release.outputs.upload_url }}
238-
asset_path: ./builds/containerd-binaries-ubuntu-18.04-amd64/${{ steps.catalog.outputs.file2 }}
197+
asset_path: ./builds/containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file2 }}
239198
asset_name: ${{ steps.catalog.outputs.file2 }}
240199
asset_content_type: text/plain
241-
- name: Upload Linux AMD64 cri containerd tarball
200+
- name: Upload Linux cri containerd tarball
242201
uses: actions/upload-release-asset@v1
243202
env:
244203
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
245204
with:
246205
upload_url: ${{ steps.create_release.outputs.upload_url }}
247-
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04-amd64/${{ steps.catalog.outputs.file3 }}
206+
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file3 }}
248207
asset_name: ${{ steps.catalog.outputs.file3 }}
249208
asset_content_type: application/gzip
250-
- name: Upload Linux AMD64 cri sha256 sum
209+
- name: Upload Linux cri sha256 sum
251210
uses: actions/upload-release-asset@v1
252211
env:
253212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
254213
with:
255214
upload_url: ${{ steps.create_release.outputs.upload_url }}
256-
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04-amd64/${{ steps.catalog.outputs.file4 }}
215+
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04/${{ steps.catalog.outputs.file4 }}
257216
asset_name: ${{ steps.catalog.outputs.file4 }}
258217
asset_content_type: text/plain
259-
- name: Upload Linux ARM64 containerd tarball
218+
- name: Upload Windows containerd tarball
260219
uses: actions/upload-release-asset@v1
261220
env:
262221
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
263222
with:
264223
upload_url: ${{ steps.create_release.outputs.upload_url }}
265-
asset_path: ./builds/containerd-binaries-ubuntu-18.04-arm64/${{ steps.catalog.outputs.file5 }}
224+
asset_path: ./builds/containerd-binaries-windows-2019/${{ steps.catalog.outputs.file5 }}
266225
asset_name: ${{ steps.catalog.outputs.file5 }}
267226
asset_content_type: application/gzip
268-
- name: Upload Linux ARM64 sha256 sum
227+
- name: Upload Windows sha256 sum
269228
uses: actions/upload-release-asset@v1
270229
env:
271230
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
272231
with:
273232
upload_url: ${{ steps.create_release.outputs.upload_url }}
274-
asset_path: ./builds/containerd-binaries-ubuntu-18.04-arm64/${{ steps.catalog.outputs.file6 }}
233+
asset_path: ./builds/containerd-binaries-windows-2019/${{ steps.catalog.outputs.file6 }}
275234
asset_name: ${{ steps.catalog.outputs.file6 }}
276235
asset_content_type: text/plain
277-
- name: Upload Linux ARM64 cri containerd tarball
236+
- name: Upload Windows cri containerd tarball
278237
uses: actions/upload-release-asset@v1
279238
env:
280239
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
281240
with:
282241
upload_url: ${{ steps.create_release.outputs.upload_url }}
283-
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04-arm64/${{ steps.catalog.outputs.file7 }}
242+
asset_path: ./builds/cri-containerd-binaries-windows-2019/${{ steps.catalog.outputs.file7 }}
284243
asset_name: ${{ steps.catalog.outputs.file7 }}
285244
asset_content_type: application/gzip
286-
- name: Upload Linux ARM64 cri sha256 sum
245+
- name: Upload Windows cri sha256 sum
287246
uses: actions/upload-release-asset@v1
288247
env:
289248
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
290249
with:
291250
upload_url: ${{ steps.create_release.outputs.upload_url }}
292-
asset_path: ./builds/cri-containerd-binaries-ubuntu-18.04-arm64/${{ steps.catalog.outputs.file8 }}
251+
asset_path: ./builds/cri-containerd-binaries-windows-2019/${{ steps.catalog.outputs.file8 }}
293252
asset_name: ${{ steps.catalog.outputs.file8 }}
294253
asset_content_type: text/plain
295-
- name: Upload Windows AMD64 containerd tarball
296-
uses: actions/upload-release-asset@v1
297-
env:
298-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
299-
with:
300-
upload_url: ${{ steps.create_release.outputs.upload_url }}
301-
asset_path: ./builds/containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file9 }}
302-
asset_name: ${{ steps.catalog.outputs.file9 }}
303-
asset_content_type: application/gzip
304-
- name: Upload Windows AMD64 sha256 sum
305-
uses: actions/upload-release-asset@v1
306-
env:
307-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
308-
with:
309-
upload_url: ${{ steps.create_release.outputs.upload_url }}
310-
asset_path: ./builds/containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file10 }}
311-
asset_name: ${{ steps.catalog.outputs.file10 }}
312-
asset_content_type: text/plain
313-
- name: Upload Windows AMD64 cri containerd tarball
314-
uses: actions/upload-release-asset@v1
315-
env:
316-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
317-
with:
318-
upload_url: ${{ steps.create_release.outputs.upload_url }}
319-
asset_path: ./builds/cri-containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file11 }}
320-
asset_name: ${{ steps.catalog.outputs.file11 }}
321-
asset_content_type: application/gzip
322-
- name: Upload Windows AMD64 cri sha256 sum
323-
uses: actions/upload-release-asset@v1
324-
env:
325-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
326-
with:
327-
upload_url: ${{ steps.create_release.outputs.upload_url }}
328-
asset_path: ./builds/cri-containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file12 }}
329-
asset_name: ${{ steps.catalog.outputs.file12 }}
330-
asset_content_type: text/plain

0 commit comments

Comments
 (0)