From 67d19cc9545f70f4d45f26e82636f1acb5922adf Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Thu, 9 Jan 2025 10:44:02 +0200 Subject: [PATCH 1/5] update restic to 0.9.3 --- packages/restic.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/restic.sh b/packages/restic.sh index 2ec74cb..0354e15 100644 --- a/packages/restic.sh +++ b/packages/restic.sh @@ -1,5 +1,5 @@ -RESTIC_VERSION="0.9.2" -RESTIC_CHECKSUM="dd08f71f2df5901d6b3e3faf3b4f6d2a" +RESTIC_VERSION="0.9.3" +RESTIC_CHECKSUM="6818e3744cec489a7f0da4f0e3beafeb" RESTIC_LINK="https://github.com/restic/restic/archive/v${RESTIC_VERSION}.tar.gz" download_restic() { From edb003d971f37e783c6c0fadc0755f2b9e16fe78 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Thu, 9 Jan 2025 10:44:16 +0200 Subject: [PATCH 2/5] update zinit to v0.2.14 --- .github/workflows/kernel.yaml | 2 +- autobuild/tf-build-deps-clean.sh | 2 ++ packages/zinit.sh | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 packages/zinit.sh diff --git a/.github/workflows/kernel.yaml b/.github/workflows/kernel.yaml index bfe5ca9..c52a7ce 100644 --- a/.github/workflows/kernel.yaml +++ b/.github/workflows/kernel.yaml @@ -12,7 +12,7 @@ jobs: kernel: name: "Zero-OS Kernel Image" runs-on: ubuntu-latest - container: ubuntu:18.04 + container: ubuntu:20.04 steps: - name: Checkout code uses: actions/checkout@v1 diff --git a/autobuild/tf-build-deps-clean.sh b/autobuild/tf-build-deps-clean.sh index a243f62..8fadd63 100644 --- a/autobuild/tf-build-deps-clean.sh +++ b/autobuild/tf-build-deps-clean.sh @@ -1,4 +1,6 @@ #!/bin/bash +export DEBIAN_FRONTEND=noninteractive +export DEBCONF_NONINTERACTIVE_SEEN=true apt-get update diff --git a/packages/zinit.sh b/packages/zinit.sh old mode 100644 new mode 100755 index ef799a7..b57b86e --- a/packages/zinit.sh +++ b/packages/zinit.sh @@ -1,5 +1,5 @@ -ZINIT_VERSION="0.2.11" -ZINIT_HASH="e1d6a6f0ff604e58735cd7bd127e5c78" +ZINIT_VERSION="0.2.14" +ZINIT_HASH="2617c4d62e7b33e34c1836e39a3be93e" ZINIT_BINARY="https://github.com/threefoldtech/zinit/releases/download/v${ZINIT_VERSION}/zinit" download_zinit() { From 5c0ded523a5121b0bd06b56ddb6a14a36c7405e0 Mon Sep 17 00:00:00 2001 From: Maxime Daniel Date: Wed, 15 Jan 2025 12:02:02 +0100 Subject: [PATCH 3/5] github: rollback to ubuntu 18.04 required for flists on runtime --- .github/workflows/kernel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kernel.yaml b/.github/workflows/kernel.yaml index c52a7ce..bfe5ca9 100644 --- a/.github/workflows/kernel.yaml +++ b/.github/workflows/kernel.yaml @@ -12,7 +12,7 @@ jobs: kernel: name: "Zero-OS Kernel Image" runs-on: ubuntu-latest - container: ubuntu:20.04 + container: ubuntu:18.04 steps: - name: Checkout code uses: actions/checkout@v1 From 5a615a171aa5491d6808543228df907e3297b945 Mon Sep 17 00:00:00 2001 From: Maxime Daniel Date: Wed, 15 Jan 2025 12:09:06 +0100 Subject: [PATCH 4/5] github: give a try to manually install go --- .github/workflows/kernel.yaml | 13 ++++++++----- autobuild/tf-build-deps-clean.sh | 8 ++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kernel.yaml b/.github/workflows/kernel.yaml index bfe5ca9..e4edf3f 100644 --- a/.github/workflows/kernel.yaml +++ b/.github/workflows/kernel.yaml @@ -22,16 +22,19 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: runbranch - - name: "Install: go" - uses: actions/setup-go@v1 - with: - go-version: 1.21 - id: go + # - name: "Install: go" + # uses: actions/setup-go@v1 + # with: + # go-version: 1.21 + # id: go - name: "Install: requirements" run: | bash ./autobuild/tf-build-deps-clean.sh + echo "GOPATH=/gopath" >> "$GITHUB_ENV" + echo "PATH=${PATH}:/usr/local/go/bin" >> "$GITHUB_ENV" + - name: "Install: rust" uses: actions-rs/toolchain@v1 with: diff --git a/autobuild/tf-build-deps-clean.sh b/autobuild/tf-build-deps-clean.sh index 8fadd63..ca3efc5 100644 --- a/autobuild/tf-build-deps-clean.sh +++ b/autobuild/tf-build-deps-clean.sh @@ -55,3 +55,11 @@ deps+=(libconfuse-dev ncurses-bin) deps+=(libsodium-dev liburcu-dev libudev-dev udev libclang-dev clang) apt-get install -y ${deps[@]} + +# re-introduce manual go setup, github action is broken +# with our requirement of ubuntu 18.04 workaround +GOVER="1.21.0" +curl -L https://dl.google.com/go/go${GOVER}.linux-amd64.tar.gz > /tmp/go${GOVER}.linux-amd64.tar.gz +tar -C /usr/local -xzf /tmp/go${GOVER}.linux-amd64.tar.gz +mkdir -p /gopath + From bd5e90db9ae8857b271472519f5c92da6c68bf18 Mon Sep 17 00:00:00 2001 From: Maxime Daniel Date: Wed, 15 Jan 2025 12:13:55 +0100 Subject: [PATCH 5/5] github: manually install rust, using original docker build script at the end --- .github/workflows/kernel.yaml | 16 ++++++++-------- autobuild/tf-build-deps-clean.sh | 8 -------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/kernel.yaml b/.github/workflows/kernel.yaml index e4edf3f..86b67f4 100644 --- a/.github/workflows/kernel.yaml +++ b/.github/workflows/kernel.yaml @@ -30,17 +30,17 @@ jobs: - name: "Install: requirements" run: | - bash ./autobuild/tf-build-deps-clean.sh + bash ./autobuild/tf-build-deps.sh echo "GOPATH=/gopath" >> "$GITHUB_ENV" - echo "PATH=${PATH}:/usr/local/go/bin" >> "$GITHUB_ENV" + echo "PATH=${HOME}/.cargo/bin:${PATH}:/usr/local/go/bin" >> "$GITHUB_ENV" - - name: "Install: rust" - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-unknown-linux-musl - default: true + # - name: "Install: rust" + # uses: actions-rs/toolchain@v1 + # with: + # toolchain: stable + # target: x86_64-unknown-linux-musl + # default: true - name: "Fetch: sources" run: | diff --git a/autobuild/tf-build-deps-clean.sh b/autobuild/tf-build-deps-clean.sh index ca3efc5..8fadd63 100644 --- a/autobuild/tf-build-deps-clean.sh +++ b/autobuild/tf-build-deps-clean.sh @@ -55,11 +55,3 @@ deps+=(libconfuse-dev ncurses-bin) deps+=(libsodium-dev liburcu-dev libudev-dev udev libclang-dev clang) apt-get install -y ${deps[@]} - -# re-introduce manual go setup, github action is broken -# with our requirement of ubuntu 18.04 workaround -GOVER="1.21.0" -curl -L https://dl.google.com/go/go${GOVER}.linux-amd64.tar.gz > /tmp/go${GOVER}.linux-amd64.tar.gz -tar -C /usr/local -xzf /tmp/go${GOVER}.linux-amd64.tar.gz -mkdir -p /gopath -