Skip to content

Commit df0cc5b

Browse files
mxpvmxpv
authored
Merge pull request #5437 from dmcgowan/revert-arm64-release-builds
Revert arm64 release builds
2 parents 3200519 + 15d9703 commit df0cc5b

3 files changed

Lines changed: 27 additions & 110 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 25 additions & 103 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,44 +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-
echo "SECCOMP_ARCH=aarch64" >> $GITHUB_ENV
93-
}
80+
echo "OS=${os}" >> $GITHUB_ENV
9481
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
9582
96-
- name: Install dependencies
97-
if: ${{ runner.os == 'Linux' }}
98-
shell: bash
99-
run: |
100-
if [[ "${GOARCH}" != "amd64" ]]; then
101-
sudo add-apt-repository "deb [arch=arm64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -sc) main" || true
102-
sudo add-apt-repository "deb [arch=arm64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -sc)-updates main" || true
103-
104-
sudo dpkg --add-architecture arm64
105-
sudo dpkg --add-architecture s390x
106-
sudo dpkg --add-architecture ppc64el
107-
108-
sudo apt-get update || true
109-
110-
sudo apt-get install -y \
111-
crossbuild-essential-arm64 \
112-
crossbuild-essential-s390x \
113-
crossbuild-essential-ppc64el \
114-
libseccomp-dev:amd64 \
115-
libseccomp-dev:arm64 \
116-
libseccomp-dev:s390x \
117-
libseccomp-dev:ppc64el
118-
# libbtrfs-dev is not available for Ubuntu 18.04
119-
# libbtrfs-dev:amd64 \
120-
# libbtrfs-dev:arm64 \
121-
# libbtrfs-dev:s390x \
122-
# libbtrfs-dev:ppc64el
123-
fi
124-
12583
- name: Checkout containerd
12684
uses: actions/checkout@v2
12785
with:
@@ -150,39 +108,39 @@ jobs:
150108
make build
151109
make binaries
152110
rm bin/containerd-stress*
153-
[[ "${GOOS}" == "windows" ]] && {
111+
[[ "${OS}" == "windows" ]] && {
154112
(
155113
bindir="$(pwd)/bin"
156114
cd ../../Microsoft/hcsshim
157115
GO111MODULE=on go build -mod=vendor -o "${bindir}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
158116
)
159117
}
160-
TARFILE="containerd-${RELEASE_VER#v}-${GOOS}-${GOARCH}.tar.gz"
118+
TARFILE="containerd-${RELEASE_VER#v}-${OS}-amd64.tar.gz"
161119
tar czf ${TARFILE} bin/
162120
sha256sum ${TARFILE} >${TARFILE}.sha256sum
163121
working-directory: src/github.com/containerd/containerd
164122

165123
- name: Save build binaries
166124
uses: actions/upload-artifact@v2
167125
with:
168-
name: containerd-binaries-${{ matrix.os }}-${{ matrix.arch }}
126+
name: containerd-binaries-${{ matrix.os }}
169127
path: src/github.com/containerd/containerd/*.tar.gz*
170128

171129
- name: Make cri-containerd tar
172130
shell: bash
173131
env:
174132
RUNC_FLAVOR: runc
175133
run: |
176-
if [[ "${GOOS}" == "linux" ]]; then
177-
sudo -E PATH=$PATH -E SECCOMP_ARCH="${SECCOMP_ARCH}" script/setup/install-seccomp
134+
if [[ "${OS}" == "linux" ]]; then
135+
sudo -E PATH=$PATH script/setup/install-seccomp
178136
fi
179137
make cri-cni-release
180138
working-directory: src/github.com/containerd/containerd
181139

182140
- name: Save cri-containerd binaries
183141
uses: actions/upload-artifact@v2
184142
with:
185-
name: cri-containerd-binaries-${{ matrix.os }}-${{ matrix.arch }}
143+
name: cri-containerd-binaries-${{ matrix.os }}
186144
path: src/github.com/containerd/containerd/releases/cri-containerd-cni-*.tar.gz*
187145

188146
release:
@@ -200,7 +158,7 @@ jobs:
200158
id: catalog
201159
run: |
202160
_filenum=1
203-
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
204162
for f in `ls builds/containerd-binaries-${i}`; do
205163
echo "::set-output name=file${_filenum}::${f}"
206164
let "_filenum+=1"
@@ -221,111 +179,75 @@ jobs:
221179
body_path: ./builds/containerd-release-notes/release-notes.md
222180
draft: false
223181
prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
224-
- name: Upload Linux AMD64 containerd tarball
182+
- name: Upload Linux containerd tarball
225183
uses: actions/upload-release-asset@v1
226184
env:
227185
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
228186
with:
229187
upload_url: ${{ steps.create_release.outputs.upload_url }}
230-
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 }}
231189
asset_name: ${{ steps.catalog.outputs.file1 }}
232190
asset_content_type: application/gzip
233-
- name: Upload Linux AMD64 sha256 sum
191+
- name: Upload Linux sha256 sum
234192
uses: actions/upload-release-asset@v1
235193
env:
236194
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
237195
with:
238196
upload_url: ${{ steps.create_release.outputs.upload_url }}
239-
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 }}
240198
asset_name: ${{ steps.catalog.outputs.file2 }}
241199
asset_content_type: text/plain
242-
- name: Upload Linux AMD64 cri containerd tarball
200+
- name: Upload Linux cri containerd tarball
243201
uses: actions/upload-release-asset@v1
244202
env:
245203
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
246204
with:
247205
upload_url: ${{ steps.create_release.outputs.upload_url }}
248-
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 }}
249207
asset_name: ${{ steps.catalog.outputs.file3 }}
250208
asset_content_type: application/gzip
251-
- name: Upload Linux AMD64 cri sha256 sum
209+
- name: Upload Linux cri sha256 sum
252210
uses: actions/upload-release-asset@v1
253211
env:
254212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
255213
with:
256214
upload_url: ${{ steps.create_release.outputs.upload_url }}
257-
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 }}
258216
asset_name: ${{ steps.catalog.outputs.file4 }}
259217
asset_content_type: text/plain
260-
- name: Upload Linux ARM64 containerd tarball
218+
- name: Upload Windows containerd tarball
261219
uses: actions/upload-release-asset@v1
262220
env:
263221
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
264222
with:
265223
upload_url: ${{ steps.create_release.outputs.upload_url }}
266-
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 }}
267225
asset_name: ${{ steps.catalog.outputs.file5 }}
268226
asset_content_type: application/gzip
269-
- name: Upload Linux ARM64 sha256 sum
227+
- name: Upload Windows sha256 sum
270228
uses: actions/upload-release-asset@v1
271229
env:
272230
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
273231
with:
274232
upload_url: ${{ steps.create_release.outputs.upload_url }}
275-
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 }}
276234
asset_name: ${{ steps.catalog.outputs.file6 }}
277235
asset_content_type: text/plain
278-
- name: Upload Linux ARM64 cri containerd tarball
236+
- name: Upload Windows cri containerd tarball
279237
uses: actions/upload-release-asset@v1
280238
env:
281239
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
282240
with:
283241
upload_url: ${{ steps.create_release.outputs.upload_url }}
284-
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 }}
285243
asset_name: ${{ steps.catalog.outputs.file7 }}
286244
asset_content_type: application/gzip
287-
- name: Upload Linux ARM64 cri sha256 sum
245+
- name: Upload Windows cri sha256 sum
288246
uses: actions/upload-release-asset@v1
289247
env:
290248
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
291249
with:
292250
upload_url: ${{ steps.create_release.outputs.upload_url }}
293-
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 }}
294252
asset_name: ${{ steps.catalog.outputs.file8 }}
295253
asset_content_type: text/plain
296-
- name: Upload Windows AMD64 containerd tarball
297-
uses: actions/upload-release-asset@v1
298-
env:
299-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
300-
with:
301-
upload_url: ${{ steps.create_release.outputs.upload_url }}
302-
asset_path: ./builds/containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file9 }}
303-
asset_name: ${{ steps.catalog.outputs.file9 }}
304-
asset_content_type: application/gzip
305-
- name: Upload Windows AMD64 sha256 sum
306-
uses: actions/upload-release-asset@v1
307-
env:
308-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
309-
with:
310-
upload_url: ${{ steps.create_release.outputs.upload_url }}
311-
asset_path: ./builds/containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file10 }}
312-
asset_name: ${{ steps.catalog.outputs.file10 }}
313-
asset_content_type: text/plain
314-
- name: Upload Windows AMD64 cri containerd tarball
315-
uses: actions/upload-release-asset@v1
316-
env:
317-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
318-
with:
319-
upload_url: ${{ steps.create_release.outputs.upload_url }}
320-
asset_path: ./builds/cri-containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file11 }}
321-
asset_name: ${{ steps.catalog.outputs.file11 }}
322-
asset_content_type: application/gzip
323-
- name: Upload Windows AMD64 cri sha256 sum
324-
uses: actions/upload-release-asset@v1
325-
env:
326-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
327-
with:
328-
upload_url: ${{ steps.create_release.outputs.upload_url }}
329-
asset_path: ./builds/cri-containerd-binaries-windows-2019-amd64/${{ steps.catalog.outputs.file12 }}
330-
asset_name: ${{ steps.catalog.outputs.file12 }}
331-
asset_content_type: text/plain

‎releases/v1.5.0-rc.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The sixth major release of containerd includes many stability improvements
1515
and code organization changes to make contribution easier and make future
1616
features cleaner to develop. This includes bringing CRI development into the
1717
main containerd repository and switching to Go modules. This release also
18-
brings support for the Node Resource Interface (NRI) and ARM64 builds.
18+
brings support for the Node Resource Interface (NRI).
1919
2020
### Highlights
2121
@@ -24,7 +24,6 @@ brings support for the Node Resource Interface (NRI) and ARM64 builds.
2424
* **Move to Go modules** [#4760](https://github.com/containerd/containerd/pull/4760)
2525
* **Remove `selinux` build tag** [#4849](https://github.com/containerd/containerd/pull/4849)
2626
* **Add json log format output option for daemon log** [#4803](https://github.com/containerd/containerd/pull/4803)
27-
* **Add release builds for ARM64** [#5329](https://github.com/containerd/containerd/pull/5329)
2827
2928
#### Snapshots
3029
* **Add configurable overlayfs path** [#4505](https://github.com/containerd/containerd/pull/4505)

‎script/setup/install-seccomp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ export SECCOMP_PATH=$(mktemp -d)
2727
curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" | tar -xzC "$SECCOMP_PATH" --strip-components=1
2828
(
2929
cd "$SECCOMP_PATH"
30-
host=""
31-
if [ -v SECCOMP_ARCH ]; then
32-
host="--host=${SECCOMP_ARCH}"
33-
fi
34-
./configure --prefix=/usr/local ${host}
30+
./configure --prefix=/usr/local
3531
make
3632
make install
3733
ldconfig

0 commit comments

Comments
 (0)