1
0
mirror of https://github.com/docker/docker-credential-helpers.git synced 2026-06-13 16:01:28 +05:30

Merge pull request #276 from crazy-max/ci-bump-os

ci: bump runners to ubuntu-22.04
This commit is contained in:
Sebastiaan van Stijn
2023-05-27 16:07:51 +02:00
committed by GitHub
+9 -8
View File
@@ -19,7 +19,7 @@ env:
jobs: jobs:
validate: validate:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -44,6 +44,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- ubuntu-22.04
- ubuntu-20.04 - ubuntu-20.04
- macOS-11 - macOS-11
- windows-2022 - windows-2022
@@ -59,13 +60,13 @@ jobs:
cache: true cache: true
- -
name: Install deps name: Install deps
if: ${{ matrix.os == 'ubuntu-20.04' }} if: startsWith(matrix.os, 'ubuntu-')
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y dbus-x11 gnome-keyring libsecret-1-dev pass sudo apt-get install -y dbus-x11 gnome-keyring libsecret-1-dev pass
- -
name: GPG conf name: GPG conf
if: ${{ matrix.os == 'ubuntu-20.04' }} if: startsWith(matrix.os, 'ubuntu-')
uses: actions/github-script@v6 uses: actions/github-script@v6
id: gpg id: gpg
with: with:
@@ -82,7 +83,7 @@ jobs:
core.setOutput('passphrase', fs.readFileSync('.github/workflows/fixtures/7D851EB72D73BDA0.pass', {encoding: 'utf8'})); core.setOutput('passphrase', fs.readFileSync('.github/workflows/fixtures/7D851EB72D73BDA0.pass', {encoding: 'utf8'}));
- -
name: Import GPG key name: Import GPG key
if: ${{ matrix.os == 'ubuntu-20.04' }} if: startsWith(matrix.os, 'ubuntu-')
uses: crazy-max/ghaction-import-gpg@v5 uses: crazy-max/ghaction-import-gpg@v5
with: with:
gpg_private_key: ${{ steps.gpg.outputs.key }} gpg_private_key: ${{ steps.gpg.outputs.key }}
@@ -90,7 +91,7 @@ jobs:
- -
name: Test name: Test
run: | run: |
if [ "${{ matrix.os }}" = "ubuntu-20.04" ]; then if [[ "${{ matrix.os }}" = ubuntu-* ]]; then
echo -e "trust\n5\ny" | gpg --batch --no-tty --command-fd 0 --edit-key 7D851EB72D73BDA0 echo -e "trust\n5\ny" | gpg --batch --no-tty --command-fd 0 --edit-key 7D851EB72D73BDA0
pass init 7D851EB72D73BDA0 pass init 7D851EB72D73BDA0
fi fi
@@ -104,7 +105,7 @@ jobs:
file: ./coverage.txt file: ./coverage.txt
test-sandboxed: test-sandboxed:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- -
name: Checkout name: Checkout
@@ -127,7 +128,7 @@ jobs:
file: ${{ env.DESTDIR }}//coverage.txt file: ${{ env.DESTDIR }}//coverage.txt
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- -
name: Checkout name: Checkout
@@ -173,7 +174,7 @@ jobs:
files: ${{ env.DESTDIR }}/* files: ${{ env.DESTDIR }}/*
build-deb: build-deb:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- -
name: Checkout name: Checkout