From ce0ef39abd3b653be62ad00d74089bf32120c1d6 Mon Sep 17 00:00:00 2001 From: fy Date: Tue, 28 Jul 2026 23:24:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ci:=20=E5=8D=87=E7=BA=A7=20GopherJS=20?= =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF=E9=A2=84=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/jsport.yml | 17 ++++++++++++----- .github/workflows/test_and_lint.yml | 7 +++---- go.mod | 6 +++--- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/jsport.yml b/.github/workflows/jsport.yml index 5814410a..630eb477 100644 --- a/.github/workflows/jsport.yml +++ b/.github/workflows/jsport.yml @@ -3,23 +3,29 @@ name: Build Js Port on: push: branches: [ "main" ] + pull_request: + branches: [ "main" ] + merge_group: + +permissions: + contents: read jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: - go-version: '1.19' + go-version: '1.21.13' - name: Install gopherjs run: | - go install github.com/gopherjs/gopherjs@v1.19.0-beta2 - go mod download golang.org/x/exp + go install github.com/gopherjs/gopherjs@v1.21.0 + go mod download - name: Build run: gopherjs build -m -o jsport/dicescript.cjs github.com/sealdice/dicescript/jsport @@ -33,6 +39,7 @@ jobs: run: cd ./jsport && pnpm install && pnpm build - name: Deploy + if: github.event_name == 'push' && github.ref == 'refs/heads/main' uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.MY_TOKEN }} diff --git a/.github/workflows/test_and_lint.yml b/.github/workflows/test_and_lint.yml index 2eeca6a2..ae34de5c 100644 --- a/.github/workflows/test_and_lint.yml +++ b/.github/workflows/test_and_lint.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: '1.18.x' + go-version: '1.21.13' - name: Download modules run: go mod download @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: '1.18.x' + go-version: '1.21.13' - name: Download modules run: go mod download @@ -60,6 +60,5 @@ jobs: with: version: v1.57.2 only-new-issues: true - skip-pkg-cache: true - skip-build-cache: true + skip-cache: true args: --timeout 9999s diff --git a/go.mod b/go.mod index 2c473f7b..f3041033 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/sealdice/dicescript -go 1.18 +go 1.21 require ( - github.com/gopherjs/gopherjs v1.18.0-beta1 + github.com/gopherjs/gopherjs v1.21.0 github.com/peterh/liner v1.2.2 github.com/stretchr/testify v1.8.0 golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 @@ -13,6 +13,6 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/mattn/go-runewidth v0.0.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.23.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) From f815b7ba11ee240b803a9859ebe0ebef926aa670 Mon Sep 17 00:00:00 2001 From: fy Date: Wed, 29 Jul 2026 12:53:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ci:=20=E8=BE=93=E5=87=BA=20GopherJS=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/jsport.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jsport.yml b/.github/workflows/jsport.yml index 630eb477..4180e023 100644 --- a/.github/workflows/jsport.yml +++ b/.github/workflows/jsport.yml @@ -28,7 +28,19 @@ jobs: go mod download - name: Build - run: gopherjs build -m -o jsport/dicescript.cjs github.com/sealdice/dicescript/jsport + shell: bash + run: | + set +e + output=$(gopherjs build -m -o jsport/dicescript.cjs github.com/sealdice/dicescript/jsport 2>&1) + status=$? + printf '%s\n' "$output" + if (( status != 0 )); then + message=${output//'%'/'%25'} + message=${message//$'\r'/'%0D'} + message=${message//$'\n'/'%0A'} + echo "::error title=GopherJS build failed::$message" + fi + exit "$status" - name: Setup pnpm uses: pnpm/action-setup@v4 From d665cdfd181314cad8408d5593c7e0575e42c2e6 Mon Sep 17 00:00:00 2001 From: fy Date: Wed, 29 Jul 2026 12:58:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ci:=20=E5=85=81=E8=AE=B8=20GopherJS=20?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=A8=A1=E5=9D=97=E6=A0=A1=E9=AA=8C=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/jsport.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/jsport.yml b/.github/workflows/jsport.yml index 4180e023..b2a5e00f 100644 --- a/.github/workflows/jsport.yml +++ b/.github/workflows/jsport.yml @@ -29,6 +29,8 @@ jobs: - name: Build shell: bash + env: + GOFLAGS: -mod=mod run: | set +e output=$(gopherjs build -m -o jsport/dicescript.cjs github.com/sealdice/dicescript/jsport 2>&1)