From 9fd564d5430f9e340f9ad01332623dde648ab240 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sun, 6 Aug 2023 18:29:16 +0200 Subject: [PATCH] .github/workflows: update and fix CI --- .github/workflows/test.yml | 4 ++-- cmd/age/testdata/encrypted_keys.txt | 1 + cmd/age/testdata/scrypt.txt | 1 + cmd/age/testdata/terminal.txt | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3059198..565963a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - go: [1.18.x, 1.19.x] + go: [1.19.x, 1.x] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: @@ -24,7 +24,7 @@ jobs: run: go test -race ./... freebsd: name: Test (FreeBSD) - runs-on: macos-10.15 + runs-on: macos-12 steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/cmd/age/testdata/encrypted_keys.txt b/cmd/age/testdata/encrypted_keys.txt index 8671079..7b4f716 100644 --- a/cmd/age/testdata/encrypted_keys.txt +++ b/cmd/age/testdata/encrypted_keys.txt @@ -2,6 +2,7 @@ # age file password prompt during encryption [windows] skip # no pty support +[go1.20] skip # https://go.dev/issue/61779 # use an encrypted OpenSSH private key without .pub file age -R key_ed25519.pub -o ed25519.age input diff --git a/cmd/age/testdata/scrypt.txt b/cmd/age/testdata/scrypt.txt index 987cfbb..8a1b684 100644 --- a/cmd/age/testdata/scrypt.txt +++ b/cmd/age/testdata/scrypt.txt @@ -1,4 +1,5 @@ [windows] skip # no pty support +[go1.20] skip # https://go.dev/issue/61779 # encrypt with a provided passphrase stdin input diff --git a/cmd/age/testdata/terminal.txt b/cmd/age/testdata/terminal.txt index cd2f5d4..849e772 100644 --- a/cmd/age/testdata/terminal.txt +++ b/cmd/age/testdata/terminal.txt @@ -1,4 +1,5 @@ [windows] skip # no pty support +[go1.20] skip # https://go.dev/issue/61779 # controlling terminal is used instead of stdin/stderr pty terminal