Skip to content

Commit e359090

Browse files
committed
Add newer Ubuntu and Golang versions to testmatrix
Also, GO111MODULE should default to on since 1.13 anyways. And our makefile installs goversioninfo itself. Also separate tests form building.
1 parent f4f70d3 commit e359090

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

.github/workflows/test.yml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,36 @@ jobs:
88
test:
99
strategy:
1010
matrix:
11-
go-version: [1.13.x]
12-
platform: [ubuntu-18.04, macOS-10.15, windows-2019]
11+
go-version: [ '1.13', '1.16' ]
12+
platform: [ ubuntu-18.04, ubuntu-20.04, macOS-10.15, windows-2019 ]
1313
runs-on: ${{ matrix.platform }}
1414
env:
15-
GO111MODULE: "on"
15+
GOPATH: "${HOME}/go"
16+
PATH: "${PATH}:${GOPATH}/bin"
1617

1718
steps:
1819
- name: Install Go
1920
uses: actions/[email protected]
2021
with:
2122
go-version: ${{ matrix.go-version }}
2223
- name: Install libgtk-3-dev
23-
if: matrix.platform == 'ubuntu-18.04'
24-
run: |
25-
sudo apt-get update -y
26-
sudo apt-get install -y libgtk-3-dev
24+
if: startsWith(matrix.os, 'ubuntu')
25+
run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev
2726
- name: Install UPX (Linux)
28-
if: matrix.platform == 'ubuntu-18.04'
29-
run: sudo apt-get update && sudo apt-get install upx-ucl
27+
if: startsWith(matrix.os, 'ubuntu')
28+
run: sudo apt-get update -y && sudo apt-get install -y upx-ucl
3029
- name: Install UPX (Windows)
31-
if: matrix.platform == 'windows-2019'
30+
if: startsWith(matrix.os, 'windows')
3231
run: choco install upx -y
33-
- name: Install goversioninfo
34-
shell: bash
35-
run: |
36-
export GOPATH="${HOME}/go"
37-
mkdir -p ${GOPATH}/bin
38-
mkdir -p ${GOPATH}/pkg
39-
mkdir -p ${GOPATH}/src
40-
go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@63e6d1acd3dd857ec6b8c54fbf52e10ce24a8786
4132
- name: Checkout repository
4233
uses: actions/[email protected]
43-
- name: Test and build
34+
- name: Build
4435
shell: bash
4536
run: |
46-
export GOPATH="${HOME}/go"
47-
export PATH="${GOPATH}/bin:${PATH}"
48-
make test
4937
make copy-test-files
5038
make
5139
make tools
40+
- name: Test
41+
shell: bash
42+
run: |
43+
make test

0 commit comments

Comments
 (0)