From 08ed159fe5914efd12c9b38aff460c5b4ad6391a Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Thu, 9 Mar 2023 16:15:13 +0100 Subject: [PATCH 1/3] build: bump integritee-dev docker image, .13 is based on Ubuntu 22.04 (Jammy) --- .github/workflows/build_and_test.yml | 2 +- Dockerfile | 2 +- build.Dockerfile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 57607186e2..b213b6d0a0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -94,7 +94,7 @@ jobs: clippy: runs-on: ubuntu-latest - container: "integritee/integritee-dev:0.1.12" + container: "integritee/integritee-dev:0.1.13" steps: - uses: actions/checkout@v3 - name: init rust diff --git a/Dockerfile b/Dockerfile index bb1e0ce096..076a2a3be7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM integritee/integritee-dev:0.1.12 +FROM integritee/integritee-dev:0.1.13 LABEL maintainer="zoltan@integritee.network" # By default we warp the service diff --git a/build.Dockerfile b/build.Dockerfile index d5c435165e..26c755826b 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -17,7 +17,7 @@ ### Builder Stage ################################################## -FROM integritee/integritee-dev:0.1.12 AS builder +FROM integritee/integritee-dev:0.1.13 AS builder LABEL maintainer="zoltan@integritee.network" # set environment variables @@ -49,7 +49,7 @@ RUN cargo test --release # A builder stage that uses sccache to speed up local builds with docker # Installation and setup of sccache should be moved to the integritee-dev image, so we don't # always need to compile and install sccache on CI (where we have no caching so far). -FROM integritee/integritee-dev:0.1.12 AS cached-builder +FROM integritee/integritee-dev:0.1.13 AS cached-builder LABEL maintainer="zoltan@integritee.network" # set environment variables @@ -81,7 +81,7 @@ RUN --mount=type=cache,id=cargo,target=/root/work/.cache/sccache cargo test --re ### Base Runner Stage ################################################## -FROM ubuntu:20.04 AS runner +FROM ubuntu:22.04 AS runner RUN apt update && apt install -y libssl-dev iproute2 curl From 137ad99b0d249487c50bf841a71db0313327741b Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Thu, 9 Mar 2023 16:16:29 +0100 Subject: [PATCH 2/3] GHA: change runs-on to Ubuntu 22.04 (Jammy) as well --- .github/workflows/build_and_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b213b6d0a0..6653735ce9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -21,14 +21,14 @@ env: jobs: cancel_previous_runs: name: Cancel Previous Runs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: styfle/cancel-workflow-action@0.11.0 with: access_token: ${{ secrets.GITHUB_TOKEN }} build-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -152,7 +152,7 @@ jobs: uses: andymckay/cancel-action@0.2 integration-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ always() }} needs: build-test env: From 5555291182775755ea24d9192905a0c62d67b55d Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Thu, 9 Mar 2023 17:01:49 +0100 Subject: [PATCH 3/3] GHA: use explicit Ubuntu version instead of latest --- .github/workflows/build_and_test.yml | 6 +++--- .github/workflows/delete-release.yml | 2 +- .github/workflows/label-checker.yml | 2 +- .github/workflows/publish-docker-release.yml | 2 +- .github/workflows/publish-draft-release.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6653735ce9..532e8c5721 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -93,7 +93,7 @@ jobs: path: integritee-cli-client-${{ matrix.flavor_id }}-${{ github.sha }}.tar.gz clippy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: "integritee/integritee-dev:0.1.13" steps: - uses: actions/checkout@v3 @@ -131,7 +131,7 @@ jobs: uses: andymckay/cancel-action@0.2 fmt: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: init rust @@ -252,7 +252,7 @@ jobs: release: name: Draft Release if: startsWith(github.ref, 'refs/tags/') - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [build-test, integration-tests] outputs: release_url: ${{ steps.create-release.outputs.html_url }} diff --git a/.github/workflows/delete-release.yml b/.github/workflows/delete-release.yml index b1d0e13750..71853e764b 100644 --- a/.github/workflows/delete-release.yml +++ b/.github/workflows/delete-release.yml @@ -7,7 +7,7 @@ on: jobs: purge-image: name: Delete image from ghcr.io - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: binary: ["integritee-client", "integritee-demo-validateer"] diff --git a/.github/workflows/label-checker.yml b/.github/workflows/label-checker.yml index c645658ca3..fe264a6bcd 100644 --- a/.github/workflows/label-checker.yml +++ b/.github/workflows/label-checker.yml @@ -8,7 +8,7 @@ on: jobs: check_for_matching_labels: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.base_ref == 'master' && github.event.pull_request.draft == false steps: - name: Label check diff --git a/.github/workflows/publish-docker-release.yml b/.github/workflows/publish-docker-release.yml index a73674b256..1e4cf47d6a 100644 --- a/.github/workflows/publish-docker-release.yml +++ b/.github/workflows/publish-docker-release.yml @@ -8,7 +8,7 @@ on: jobs: main: name: Push Integritee Services to Dockerhub - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: binary: ["integritee-demo-validateer", "integritee-client"] diff --git a/.github/workflows/publish-draft-release.yml b/.github/workflows/publish-draft-release.yml index 11ac50ea33..337d07dcd1 100644 --- a/.github/workflows/publish-draft-release.yml +++ b/.github/workflows/publish-draft-release.yml @@ -8,7 +8,7 @@ on: jobs: publish-draft-release: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout sources uses: actions/checkout@v3