Skip to content

Commit

Permalink
cleaning up some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
grantnelson-wf committed Jun 25, 2024
1 parent 7f57815 commit 1777c0c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
11 changes: 7 additions & 4 deletions .github/actions/setup-gopherjs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ runs:
- uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}

- name: Install Node.js for non-Linux
if: inputs.includeSyscall != 'true'
working-directory: ${{ env.GOPHERJS_PATH }}
Expand All @@ -43,7 +43,7 @@ runs:
shell: bash
# Make nodejs able to require installed modules from any working path.
run: echo "NODE_PATH=$(npm root)" >> $GITHUB_ENV

- name: Adjust Windows Variables
if: inputs.fixTemps == 'true'
shell: bash
Expand All @@ -53,12 +53,15 @@ runs:
echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
echo "TMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
echo "TMPDIR=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
echo ::notice::$TEMP
echo ::notice::$TMP
echo ::notice::$TMPDIR
- name: Install GopherJS
working-directory: ${{ env.GOPHERJS_PATH }}
shell: bash
run: go install -v

- name: Setup information
shell: bash
run: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
working-directory: ${{ env.GOPHERJS_PATH }}
# Run all tests except gorepo tests.
run: go test -v -race $(go list ./... | grep -v github.com/gopherjs/gopherjs/tests/gorepo)

todomvc_tests:
name: TodoMVC Tests
runs-on: ubuntu-latest
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
| grep -v -x -f .std_test_pkg_exclusions \
)
gopherjs test -p 2 --minify -v --short $PACKAGE_NAMES
gorepo_tests:
name: Gorepo Tests
runs-on: ubuntu-latest
Expand All @@ -178,4 +178,3 @@ jobs:
- name: Run GopherJS tests
working-directory: ${{ env.GOPHERJS_PATH }}
run: go test -v github.com/gopherjs/gopherjs/tests/gorepo

5 changes: 3 additions & 2 deletions tests/syscall_legacy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ import (
// but we support using the extension when "legacy_syscall" build tag is set.
// This test can be removed after we stop supporting node_syscall extension.
func TestLegacySyscall(t *testing.T) {
t.Skip(`This test is disabled because it fails under CI with v20 node.`)

if runtime.GOOS != "linux" {
t.Skip("This test is supported only under Linux")
}

t.Skip(`This test is disabled because it fails under CI with v20 node.`)

cmd := exec.Command("gopherjs", "run", "--tags=legacy_syscall", "./testdata/legacy_syscall/main.go")
out, err := cmd.CombinedOutput()
got := string(out)
Expand Down

0 comments on commit 1777c0c

Please sign in to comment.