This repository was archived by the owner on Aug 29, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 15
feat: allow skipping go-test on certain OSes #455
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cf56bbd
feat: standarise JSON config reading
galargh 160a82d
feat: allow skipping go-test on certain OSes
galargh 54a56e9
fix: go-test conditional
galargh 564b375
chore: show config after extracting it
galargh 8ec5b85
Merge branch 'next' into read-config
galargh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| name: read config | ||
| description: Reads workflow config | ||
|
|
||
| outputs: | ||
| json: | ||
| description: JSON config | ||
| value: ${{ steps.config.outputs.json }} | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - id: config | ||
| run: | | ||
| eof="EOF$RANDOM" | ||
| path="${GITHUB_WORKFLOW_REF%.yml@*}" | ||
| path="./${path#*/*/}-config.json" | ||
| printf "json<<$eof\n%s\n$eof" "$(cat "$path" || echo '{}')" >> $GITHUB_OUTPUT | ||
| shell: bash | ||
| - env: | ||
| CONFIG: ${{ steps.config.outputs.json }} | ||
| run: echo "$CONFIG" | ||
| shell: bash |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,24 +5,18 @@ jobs: | |
| unit: | ||
| runs-on: ubuntu-latest | ||
| name: All | ||
| env: | ||
| RUNGOGENERATE: false | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
| - id: config | ||
| uses: protocol/.github/.github/actions/read-config@master | ||
| - uses: actions/setup-go@v3 | ||
| with: | ||
| go-version: "1.19.x" | ||
| - name: Run repo-specific setup | ||
| uses: ./.github/actions/go-check-setup | ||
| if: hashFiles('./.github/actions/go-check-setup') != '' | ||
| - name: Read config | ||
| if: hashFiles('./.github/workflows/go-check-config.json') != '' | ||
| run: | | ||
| if jq -re .gogenerate ./.github/workflows/go-check-config.json; then | ||
| echo "RUNGOGENERATE=true" >> $GITHUB_ENV | ||
| fi | ||
| - name: Install staticcheck | ||
| run: go install honnef.co/go/tools/cmd/staticcheck@376210a89477dedbe6fdc4484b233998650d7b3c # 2022.1.3 (v0.3.3) | ||
| - name: Check that go.mod is tidy | ||
|
|
@@ -57,7 +51,7 @@ jobs: | |
| staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g' | ||
| - name: go generate | ||
| uses: protocol/[email protected] | ||
| if: (success() || failure()) && env.RUNGOGENERATE == 'true' | ||
| if: (success() || failure()) && fromJSON(steps.config.outputs.json).gogenerate == true | ||
| with: | ||
| run: | | ||
| git clean -fd # make sure there aren't untracked files / directories | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,13 +10,14 @@ jobs: | |
| go: [ "1.18.x", "1.19.x" ] | ||
| env: | ||
| COVERAGES: "" | ||
| SKIP32BIT: false | ||
| runs-on: ${{ fromJSON(vars[format('UCI_GO_TEST_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }} | ||
| name: ${{ matrix.os }} (go ${{ matrix.go }}) | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
| - id: config | ||
| uses: protocol/.github/.github/actions/read-config@master | ||
| - uses: actions/setup-go@v3 | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we reduce duplication? Around here we'd set |
||
| with: | ||
| go-version: ${{ matrix.go }} | ||
|
|
@@ -35,22 +36,19 @@ jobs: | |
| - name: Run repo-specific setup | ||
| uses: ./.github/actions/go-test-setup | ||
| if: hashFiles('./.github/actions/go-test-setup') != '' | ||
| - name: Read config | ||
| if: hashFiles('./.github/workflows/go-test-config.json') != '' | ||
| shell: bash | ||
| run: | | ||
| if jq -re .skip32bit ./.github/workflows/go-test-config.json; then | ||
| echo "SKIP32BIT=true" >> $GITHUB_ENV | ||
| fi | ||
| - name: Run tests | ||
| if: contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false | ||
| uses: protocol/[email protected] | ||
| with: | ||
| # Use -coverpkg=./..., so that we include cross-package coverage. | ||
| # If package ./A imports ./B, and ./A's tests also cover ./B, | ||
| # this means ./B's coverage will be significantly higher than 0%. | ||
| run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./... | ||
| - name: Run tests (32 bit) | ||
| if: matrix.os != 'macos' && env.SKIP32BIT == 'false' # can't run 32 bit tests on OSX. | ||
| # can't run 32 bit tests on OSX. | ||
| if: matrix.os != 'macos' && | ||
| fromJSON(steps.config.outputs.json).skip32bit != true && | ||
| contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false | ||
| uses: protocol/[email protected] | ||
| env: | ||
| GOARCH: 386 | ||
|
|
@@ -59,7 +57,9 @@ 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 | ||
| # speed things up. Windows and OSX VMs are slow | ||
| if: matrix.os == 'ubuntu' && | ||
| contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false | ||
| uses: protocol/[email protected] | ||
| with: | ||
| run: go test -v -race ./... | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.