Skip to content

Commit 4a68458

Browse files
maxuxashraffouda
authored andcommitted
Make ubuntu 20.04 still available (#2558)
* Make ubuntu 20.04 still available * Force commands to be run on bash * bin-packages: drop sudo since it's running in container * Include build-essential on basesystem.sh * Improve bin-packages basesystem * Fix two remaining failing bin-packages build * Test blindly fixing test.yaml * Update tests working directory * Debug test.yaml * Add docker to basesystem * Disable zos/pkg which doesn't exists anymore * Fix latest issue on test.yaml * Setup docker on qsfs package directly * bins: drop docker.io from all packages by default * Apply dependencies check on qsfs * Fix containerd apt-get prompt * Fix runs apt-get prompt
1 parent 5be8a2d commit 4a68458

7 files changed

Lines changed: 38 additions & 20 deletions

File tree

.github/workflows/bin-package-no-tag.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ on:
1717
jobs:
1818
builder:
1919
name: builder
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-latest
21+
container: ubuntu:20.04
2122
steps:
2223
- name: Checkout code into the Go module directory
2324
uses: actions/checkout@v1
2425
- name: Setup basesystem
2526
run: |
2627
cd bins
27-
sudo -E ./bins-extra.sh --package basesystem
28+
./bins-extra.sh --package basesystem
2829
- name: Build package (${{ inputs.package }})
2930
id: package
3031
run: |
3132
cd bins
32-
sudo -E ./bins-extra.sh --package ${{ inputs.package }}
33+
./bins-extra.sh --package ${{ inputs.package }}
3334
- name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
3435
if: success()
3536
uses: threefoldtech/publish-flist@master

.github/workflows/bin-package.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ on:
2121
jobs:
2222
builder:
2323
name: builder
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-latest
25+
container: ubuntu:20.04
2526
steps:
2627
- name: Checkout code into the Go module directory
2728
uses: actions/checkout@v1
@@ -32,6 +33,7 @@ jobs:
3233
# and then accessed later in the workflow
3334
- name: Set tag of build
3435
id: tag
36+
shell: bash
3537
run: |
3638
ref="${{ github.ref }}"
3739
if [ "${{ github.ref_type }}" = "tag" ]; then
@@ -41,14 +43,16 @@ jobs:
4143
echo "reference=${reference:0:7}" >> $GITHUB_OUTPUT
4244
fi
4345
- name: Setup basesystem
46+
shell: bash
4447
run: |
4548
cd bins
46-
sudo -E ./bins-extra.sh --package basesystem
49+
./bins-extra.sh --package basesystem
4750
- name: Build package (${{ inputs.package }})
4851
id: package
52+
shell: bash
4953
run: |
5054
cd bins
51-
sudo -E ./bins-extra.sh --package ${{ inputs.package }}
55+
./bins-extra.sh --package ${{ inputs.package }}
5256
- name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
5357
if: success()
5458
uses: threefoldtech/publish-flist@master

.github/workflows/test.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ jobs:
1818
sudo apt-get install -y libjansson-dev libhiredis-dev
1919
2020
- name: Checkout code into the Go module directory
21-
uses: actions/checkout@v1
21+
uses: actions/checkout@v4
2222

23-
- name: Get dependencies
24-
run: |
25-
cd pkg
26-
make getdeps
27-
env:
28-
GO111MODULE: on
23+
# - name: Get dependencies
24+
# run: |
25+
# cd zos/pkg
26+
# make getdeps
27+
# env:
28+
# GO111MODULE: on
2929

30-
- name: Run tests
31-
run: |
32-
cd pkg
33-
make testrace
34-
env:
35-
GO111MODULE: on
30+
# - name: Run tests
31+
# run: |
32+
# cd zos/pkg
33+
# make testrace
34+
# env:
35+
# GO111MODULE: on
3636

3737
- name: Build binaries
3838
run: |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
build_basesystem() {
22
apt-get update
3-
apt-get install -y curl wget
3+
apt-get install -y curl wget build-essential autoconf unzip
44
}
55

bins/packages/containerd/containerd.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ CONTAINERD_CHECKSUM="1ac525600fe7ba6ef76cf8a833153768"
33
CONTAINERD_LINK="https://github.com/containerd/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz"
44

55
dependencies_containerd() {
6+
export DEBIAN_FRONTEND=noninteractive
7+
export DEBCONF_NONINTERACTIVE_SEEN=true
8+
9+
610
apt-get install -y btrfs-progs libbtrfs-dev libseccomp-dev build-essential pkg-config
711

812
if [ -z $GOPATH ] || [ ! -z $CI ]; then

bins/packages/qsfs/qsfs.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
QSFS_VERSION="0.2.0-rc2"
22
QSFS_IMAGE="ghcr.io/threefoldtech/qsfs"
33

4+
ensure_dependencies() {
5+
apt-get update
6+
apt-get install -y docker.io
7+
}
8+
49
download_qsfs() {
510
echo "download qsfs"
611
download_docker_image ${QSFS_IMAGE}:${QSFS_VERSION} qsfs-${QSFS_VERSION}.tar
@@ -22,6 +27,7 @@ install_qsfs() {
2227
build_qsfs() {
2328
pushd "${DISTDIR}"
2429

30+
ensure_dependencies
2531
download_qsfs
2632
popd
2733

bins/packages/runc/runc.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ RUNC_CHECKSUM="ae8e2ac9335b8606eeccd2e7c031350a"
33
RUNC_LINK="https://github.com/opencontainers/runc/archive/refs/tags/v${RUNC_VERSION}.tar.gz"
44

55
dependencies_runc() {
6+
export DEBIAN_FRONTEND=noninteractive
7+
export DEBCONF_NONINTERACTIVE_SEEN=true
8+
69
apt-get install -y btrfs-progs libbtrfs-dev libseccomp-dev build-essential pkg-config
710

811
if [ -z $GOPATH ] || [ ! -z $CI ]; then

0 commit comments

Comments
 (0)