From 7cef3563dd7cb9a25575105b375e9efeeae344f3 Mon Sep 17 00:00:00 2001 From: Atsushi Matsuo Date: Fri, 9 Aug 2024 08:21:19 +0900 Subject: [PATCH] Update go.yml and release.yml for GitHub Actions to build with Go 1.22 (#37) --- .github/workflows/go.yml | 6 +++--- .github/workflows/release.yml | 7 ++++--- go.mod | 4 ++-- release-notes.txt | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 28aa1b4..dd06eff 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -12,7 +12,7 @@ jobs: matrix: # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-latest, macos-12, macos-13, macos-14, macos-latest, windows-2019, windows-2022, windows-latest ] - go: [ '1.21' ] + go: [ '1.22' ] steps: - name: Setup go @@ -22,7 +22,7 @@ jobs: go-version: ${{ matrix.go }} check-latest: true - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@v4 - run: go test @@ -38,7 +38,7 @@ jobs: run: make build-linux-arm64 - shell: bash - run: echo "goss_commit_hash=7e70e27fd419534b2a208af8eea1747af5658e01" >> "$GITHUB_ENV" # v0.4.0 + run: echo "goss_commit_hash=aed56336c3e8ff683e9540065b502f423dd6760d" >> "$GITHUB_ENV" # v0.4.8 - if: runner.os == 'macOS' || runner.os == 'Windows' shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8aea101..42d4f6c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,8 +12,9 @@ jobs: strategy: matrix: - os: [ ubuntu-latest ] - go: [ '1.21' ] + # https://docs.github.com/ja/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners + os: [ 'macos-latest' ] + go: [ '1.22' ] steps: - name: Setup go @@ -22,7 +23,7 @@ jobs: cache: false go-version: ${{ matrix.go }} - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@v4 - run: make dist diff --git a/go.mod b/go.mod index ae3ed94..807372b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/emic/fmcsadmin -go 1.21.0 +go 1.22 -toolchain go1.21.6 +toolchain go1.22.6 require ( github.com/golang-jwt/jwt/v4 v4.5.0 diff --git a/release-notes.txt b/release-notes.txt index 9565b60..494190a 100644 --- a/release-notes.txt +++ b/release-notes.txt @@ -21,7 +21,7 @@ Version: 2.2.0 (in development) - Add support for Windows Server 2019 and Windows Server 2022. - Tested with Claris FileMaker Server 21.0. - Tested on macOS Sonoma 14. -- Built with Go 1.21. +- Built with Go 1.22. - [INFO] Drop support for Claris FileMaker Server 19.3, 19.4 and 19.5. - [INFO] Drop support for Ubuntu 18.04 LTS. - [INFO] Drop support for CentOS Linux 7.