From 6383351756ec706b0f6aeea1a9dfc737c71bece7 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Wed, 9 Nov 2022 23:51:50 +0000 Subject: [PATCH 1/3] Update GitHub actions CI workflow OS runner images * Ubuntu-18.04 to Ubuntu-22.04 * Windows-2019 to Windows-2022 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb5b21c0..ce30f14e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: checks: name: Project Checks - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 timeout-minutes: 5 steps: @@ -40,7 +40,7 @@ jobs: strategy: matrix: - os: [ubuntu-18.04] + os: [ubuntu-22.04] steps: - uses: actions/checkout@v2 @@ -62,7 +62,7 @@ jobs: strategy: matrix: go: [1.18, 1.19] - os: [ubuntu-18.04, windows-2019] + os: [ubuntu-22.04, windows-2022] name: Tests / ${{ matrix.os }} / ${{ matrix.go }} runs-on: ${{ matrix.os }} @@ -99,8 +99,8 @@ jobs: shell: bash if: ${{ startsWith(matrix.os, 'ubuntu-') }} run: | - sudo apt update - sudo apt install gnutls-bin softhsm2 libseccomp-dev + sudo apt-get update + sudo apt-get install -y gnutls-bin softhsm2 libseccomp-dev libbtrfs-dev make binaries sudo make install sudo rm /usr/local/bin/ctr From f6a39e1bcd21af406254aa5da1e7f89f26e914cd Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Wed, 9 Nov 2022 23:54:52 +0000 Subject: [PATCH 2/3] Update GitHub actions packages in CI workflow * actions/checkout and actions/setup-go from v2 to v3. Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce30f14e..669e204f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: timeout-minutes: 5 steps: - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: 1.19 @@ -24,7 +24,7 @@ jobs: echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV echo "${{ github.workspace }}/bin" >> $GITHUB_PATH - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: src/github.com/containerd/imgcrypt fetch-depth: 25 @@ -43,7 +43,7 @@ jobs: os: [ubuntu-22.04] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: src/github.com/containerd/imgcrypt @@ -70,16 +70,16 @@ jobs: needs: [linters, checks] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: containerd/containerd path: src/github.com/containerd/containerd - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: src/github.com/containerd/imgcrypt - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: ${{ matrix.go }} From 06827a1d8664a277fed24a41cd1566c197f58814 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Wed, 9 Nov 2022 23:56:17 +0000 Subject: [PATCH 3/3] Update containerd project checks package in CI * containerd/project-checks from v1 to v1.1.0 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 669e204f..fe1175e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: path: src/github.com/containerd/imgcrypt fetch-depth: 25 - - uses: containerd/project-checks@v1 + - uses: containerd/project-checks@v1.1.0 with: working-directory: src/github.com/containerd/imgcrypt