From 9e33fed45d284e680a90a69016455b1f94bbeecc Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 05:27:14 +0530 Subject: [PATCH 1/7] fix: add psiphon key to internal path in gh action for desktop release --- .github/workflows/desktop.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 760d4b92d..33268ea45 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -6,6 +6,7 @@ on: - "release/**" - "fullbuild" - "desktopbuild" + - "fix/desktop-action" tags: - "v*" schedule: @@ -29,6 +30,13 @@ jobs: cache-key-suffix: "-windows-${{ steps.goversion.outputs.version }}" - run: sudo apt-get update && sudo apt-get install -y gcc-aarch64-linux-gnu + + - run: | + echo -n $PSIPHON_CONFIG_KEY > ./internal/engine/psiphon-config.key + echo $PSIPHON_CONFIG_JSON_AGE_BASE64 | base64 -d > ./internal/engine/psiphon-config.json.age + env: + PSIPHON_CONFIG_KEY: ${{ secrets.PSIPHON_CONFIG_KEY }} + PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} - run: make DESKTOP/linux @@ -52,6 +60,13 @@ jobs: with: go-version: "${{ steps.goversion.outputs.version }}" cache-key-suffix: "-windows-${{ steps.goversion.outputs.version }}" + + - run: | + echo -n $PSIPHON_CONFIG_KEY > ./internal/engine/psiphon-config.key + echo $PSIPHON_CONFIG_JSON_AGE_BASE64 | base64 -d > ./internal/engine/psiphon-config.json.age + env: + PSIPHON_CONFIG_KEY: ${{ secrets.PSIPHON_CONFIG_KEY }} + PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} - run: make DESKTOP/darwin @@ -75,6 +90,13 @@ jobs: with: go-version: "${{ steps.goversion.outputs.version }}" cache-key-suffix: "-windows-${{ steps.goversion.outputs.version }}" + + - run: | + echo -n $PSIPHON_CONFIG_KEY > ./internal/engine/psiphon-config.key + echo $PSIPHON_CONFIG_JSON_AGE_BASE64 | base64 -d > ./internal/engine/psiphon-config.json.age + env: + PSIPHON_CONFIG_KEY: ${{ secrets.PSIPHON_CONFIG_KEY }} + PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} - name: Install oomobile run: | From 1949994660b07006eec135a8826b90d1330fbbcd Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 05:35:15 +0530 Subject: [PATCH 2/7] chore: use buildtool to build jar for windows --- .github/workflows/desktop.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 33268ea45..3455b8ef5 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -98,17 +98,7 @@ jobs: PSIPHON_CONFIG_KEY: ${{ secrets.PSIPHON_CONFIG_KEY }} PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} - - name: Install oomobile - run: | - go install github.com/ooni/oomobile/cmd/gomobile@latest - go install github.com/ooni/oomobile/cmd/gobind@latest - go get github.com/ooni/oomobile/bind@latest - - - name: Init oomobile - run: gomobile init - - - name: Run bind - run: gomobile bind -target java/amd64 -o DESKTOP/oonimkall.jar ./pkg/oonimkall + run: make DESKTOP/windows - uses: actions/upload-artifact@v4 with: From 0333da5f0a19667b182a21f46e6f4a053a4b152f Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 05:37:33 +0530 Subject: [PATCH 3/7] fix: typo --- .github/workflows/desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 3455b8ef5..06201d9b5 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -98,7 +98,7 @@ jobs: PSIPHON_CONFIG_KEY: ${{ secrets.PSIPHON_CONFIG_KEY }} PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} - run: make DESKTOP/windows + - run: make DESKTOP/windows - uses: actions/upload-artifact@v4 with: From 2fc455dfa55dcca084231b0bf176531fd43b39eb Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 13:22:25 +0530 Subject: [PATCH 4/7] debug: add git bash to path to ensure that gomobile runs --- .github/workflows/desktop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 06201d9b5..c3fa7c76e 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -98,6 +98,9 @@ jobs: PSIPHON_CONFIG_KEY: ${{ secrets.PSIPHON_CONFIG_KEY }} PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }} + - name: Add Git Bash to PATH + run: echo "C:\Program Files\Git\bin" >> $env:GITHUB_PATH + - run: make DESKTOP/windows - uses: actions/upload-artifact@v4 From 79fc90541cbe50c76a7a715d2ce41bfcc1b848b7 Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 14:13:50 +0530 Subject: [PATCH 5/7] debug: log target os --- internal/cmd/buildtool/desktop.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/cmd/buildtool/desktop.go b/internal/cmd/buildtool/desktop.go index 1c20523ab..221afe030 100644 --- a/internal/cmd/buildtool/desktop.go +++ b/internal/cmd/buildtool/desktop.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "path/filepath" "runtime" @@ -47,6 +48,8 @@ func desktopBuildOomobile(deps buildtoolmodel.Dependencies, targetOs string) { } config.envp.Append("GOOS", targetOs) + fmt.Println(targetOs) + // NOTE: we only support windows builds on amd64 for now if targetOs == "windows" { log.Infof("detected GOOS: %s, setting target as amd64", runtime.GOOS) From 4f73c25026767f8e9e3a7ac7db57c85656f8f0c8 Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 15:11:49 +0530 Subject: [PATCH 6/7] debug: log target os before starting checks --- internal/cmd/buildtool/desktop.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/cmd/buildtool/desktop.go b/internal/cmd/buildtool/desktop.go index 221afe030..3168a0e8d 100644 --- a/internal/cmd/buildtool/desktop.go +++ b/internal/cmd/buildtool/desktop.go @@ -36,6 +36,7 @@ func desktopSubcommand() *cobra.Command { // desktopBuildOomobile invokes the oomobile build. func desktopBuildOomobile(deps buildtoolmodel.Dependencies, targetOs string) { + fmt.Println(targetOs) deps.PsiphonMaybeCopyConfigFiles() deps.GolangCheck() From 971406076f18dec4c3273ddb59818f618ef0ae77 Mon Sep 17 00:00:00 2001 From: decfox Date: Thu, 20 Nov 2025 15:50:46 +0530 Subject: [PATCH 7/7] debug: use default go path for windows desktop --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d1c879e5..80002d78e 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ ios: search/for/zip search/for/xcode #help: The `make DESKTOP/windows` command builds the oonimkall jar for windows. .PHONY: DESKTOP/windows DESKTOP/windows: search/for/java - ./script/go.bash run ./internal/cmd/buildtool desktop oomobile --target=windows + go run ./internal/cmd/buildtool desktop oomobile --target=windows #help: #help: The `make DESKTOP/darwin` command builds the oonimkall jar for darwin.