diff --git a/.github/actions/go-test-setup/action.yml b/.github/actions/go-test-setup/action.yml index 6b15ea06..7275bc7d 100644 --- a/.github/actions/go-test-setup/action.yml +++ b/.github/actions/go-test-setup/action.yml @@ -7,13 +7,6 @@ runs: shell: bash run: | echo 'CGO_ENABLED=1' >> $GITHUB_ENV - - name: Windows setup - shell: bash - if: ${{ runner.os == 'Windows' }} - run: | - pacman -S --noconfirm mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain - echo '/c/msys64/mingw64/bin' >> $GITHUB_PATH - echo 'PATH_386=/c/msys64/mingw32/bin:${{ env.PATH_386 }}' >> $GITHUB_ENV - name: Linux setup shell: bash if: ${{ runner.os == 'Linux' }} diff --git a/.github/workflows/go-test-ubuntu-22.04.yml b/.github/workflows/go-test-ubuntu-22.04.yml index cb086365..bf16af73 100644 --- a/.github/workflows/go-test-ubuntu-22.04.yml +++ b/.github/workflows/go-test-ubuntu-22.04.yml @@ -27,14 +27,6 @@ jobs: run: | go version go env - - name: Use msys2 on windows - if: startsWith(matrix.os, 'windows') - shell: bash - # The executable for msys2 is also called bash.cmd - # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells - # If we prepend its location to the PATH - # subsequent 'shell: bash' steps will use msys2 instead of gitbash - run: echo "C:/msys64/usr/bin" >> $GITHUB_PATH - name: Run repo-specific setup uses: ./.github/actions/go-test-setup if: hashFiles('./.github/actions/go-test-setup') != '' @@ -55,7 +47,7 @@ jobs: export "PATH=${{ env.PATH_386 }}:$PATH" go test -v ./... - name: Run tests with race detector - if: startsWith(matrix.os, 'ubuntu') # speed things up. Windows and OSX VMs are slow + if: startsWith(matrix.os, 'ubuntu') # speed things up. OSX VMs is slow uses: protocol/multiple-go-modules@v1.2 with: run: go test -v -race ./... diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 8a1697b2..e5673e86 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ "ubuntu", "windows", "macos" ] + os: [ "ubuntu", "macos" ] go: [ "1.18.x", "1.19.x" ] env: COVERAGES: "" @@ -26,14 +26,6 @@ jobs: run: | go version go env - - name: Use msys2 on windows - if: ${{ matrix.os == 'windows' }} - shell: bash - # The executable for msys2 is also called bash.cmd - # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells - # If we prepend its location to the PATH - # subsequent 'shell: bash' steps will use msys2 instead of gitbash - run: echo "C:/msys64/usr/bin" >> $GITHUB_PATH - name: Run repo-specific setup uses: ./.github/actions/go-test-setup if: hashFiles('./.github/actions/go-test-setup') != '' @@ -54,7 +46,7 @@ jobs: export "PATH=${{ env.PATH_386 }}:$PATH" go test -v -shuffle=on ./... - name: Run tests with race detector - if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow + if: ${{ matrix.os == 'ubuntu' }} # speed things up. OSX VMs is slow uses: protocol/multiple-go-modules@v1.2 with: run: go test -v -race ./...