From 4ef9b40603fdaf2ca270de46c52d5d87d327fccd Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 20 Sep 2024 19:45:39 -0700 Subject: [PATCH 1/2] ci: fix not passing PACKAGES on windows runners This might fix issue 156. Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 185549cb..43f9758b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,9 @@ jobs: go-version: [1.18.x, 1.22.x, 1.23.x] platform: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-latest, macos-12, macos-14] runs-on: ${{ matrix.platform }} + defaults: + run: + shell: bash steps: - name: Install Go uses: actions/setup-go@v5 @@ -18,7 +21,7 @@ jobs: run: | # This corresponds with the list in Makefile:1, but omits the "userns" # and "capability" modules, which require go1.21 as minimum. - echo 'PACKAGES="mountinfo mount sequential signal symlink user"' >> $GITHUB_ENV + echo 'PACKAGES=mountinfo mount sequential signal symlink user' >> $GITHUB_ENV - name: go mod tidy run: | make foreach CMD="go mod tidy" From eaecf094c80f02102c536679d5c6d0ed9742d8df Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 20 Sep 2024 18:23:47 -0700 Subject: [PATCH 2/2] ci: give a name to a step Otherwise it's displayed using the first line of the run: argument, i.e. like this: > Run # This corresponds with the list in Makefile:1, but omits the "userns" which is a bit confusing. Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 43f9758b..3a204003 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,8 @@ jobs: go-version: ${{ matrix.go-version }} - name: Checkout code uses: actions/checkout@v4 - - if: ${{ matrix.go-version == '1.18.x' }} + - name: Set PACKAGES env + if: ${{ matrix.go-version == '1.18.x' }} run: | # This corresponds with the list in Makefile:1, but omits the "userns" # and "capability" modules, which require go1.21 as minimum.