Skip to content

chore: sunset psiphon support #1762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DecFox merged 4 commits into from
Jan 26, 2026
Merged

chore: sunset psiphon support #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9276608
chore: sunset psiphon support
DecFox Dec 8, 2025
d2f9f4b
remoce psiphon CI setup for macos build
DecFox Dec 8, 2025
34bd8e0
fix: use macos-15 for CI runs
DecFox Jan 26, 2026
ea59f22
fix: run desktop CI on macos-15
DecFox Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ jobs:
go-version: "${{ steps.goversion.outputs.version }}"
cache-key-suffix: "-android-${{ 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: ./MOBILE/android/ensure

- run: make android
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
path: ./DESKTOP/oonimkall.jar

build_darwin_desktop_jar:
runs-on: macos-13
runs-on: macos-15

steps:
- uses: actions/checkout@v4
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
build_ios_mobile:
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -28,13 +28,6 @@ jobs:
go-version: "${{ steps.goversion.outputs.version }}"
cache-key-suffix: "-ios-${{ 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 }}

# ./internal/cmd/buildtool needs coreutils for sha256 plus GNU build tools
- run: brew install autoconf automake coreutils libtool

Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ jobs:
with:
fetch-depth: 0

- 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: Get GOVERSION content
id: goversion
run: echo "version=$(cat GOVERSION)" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -81,13 +74,6 @@ jobs:
with:
fetch-depth: 0

- 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: Get GOVERSION content
id: goversion
run: echo "version=$(cat GOVERSION)" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -180,13 +166,6 @@ jobs:
- run: sudo apt-get update -q
- run: sudo apt-get install -y qemu-user-static

- 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: Get GOVERSION content
id: goversion
run: echo "version=$(cat GOVERSION)" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -244,13 +223,6 @@ jobs:
- run: sudo apt-get update -q
- run: sudo apt-get install -y qemu-user-static

- 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: Get GOVERSION content
id: goversion
run: echo "version=$(cat GOVERSION)" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -308,13 +280,6 @@ jobs:
- run: sudo apt-get update -q
- run: sudo apt-get install -y qemu-user-static

- 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: Get GOVERSION content
id: goversion
run: echo "version=$(cat GOVERSION)" >> "$GITHUB_OUTPUT"
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
build_darwin_cli:
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -28,13 +28,6 @@ jobs:
go-version: "${{ steps.goversion.outputs.version }}"
cache-key-suffix: "-macos-${{ 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 CLI/darwin

- uses: actions/upload-artifact@v4
Expand All @@ -58,7 +51,7 @@ jobs:
path: ./CLI/miniooni-darwin-arm64

test_darwin_cli:
runs-on: macos-13
runs-on: macos-15
needs: build_darwin_cli
steps:
- uses: actions/checkout@v4
Expand All @@ -74,7 +67,7 @@ jobs:
shell: bash

publish_darwin_cli:
runs-on: macos-13
runs-on: macos-15
needs: test_darwin_cli
permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/netxlite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: "${{ matrix.os }}"
strategy:
matrix:
os: [ "ubuntu-22.04", "windows-2022", "macos-13" ]
os: [ "ubuntu-22.04", "windows-2022", "macos-15" ]
steps:

- uses: actions/checkout@v4
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ jobs:
- run: sudo apt-get update -q
- run: sudo apt-get install -y mingw-w64

- 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 EXPECTED_MINGW_W64_VERSION="10-win32" CLI/windows

- uses: actions/upload-artifact@v4
Expand Down
1 change: 0 additions & 1 deletion internal/cmd/ghgen/android.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ func buildAndPublishAndroid(w io.Writer, job *Job) {
newJob(w, buildJob, runsOnUbuntu, noDependencies, noPermissions)
newStepCheckout(w)
newStepSetupGo(w, "android")
newStepSetupPsiphon(w)
newStepMake(w, "android")
newStepUploadArtifacts(w, artifacts)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/ghgen/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const (
runsOnUbuntu = "ubuntu-22.04"

// runsOnMacOS is the macOS system where to run.
runsOnMacOS = "macos-13"
runsOnMacOS = "macos-15"

// runsOnWindows is the windows system where to run.
runsOnWindows = "windows-2022"
Expand Down
1 change: 0 additions & 1 deletion internal/cmd/ghgen/ios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func buildAndPublishMobileIOS(w io.Writer, job *Job) {
newJob(w, buildJob, runsOnMacOS, noDependencies, noPermissions)
newStepCheckout(w)
newStepSetupGo(w, "ios")
newStepSetupPsiphon(w)
iosNewStepBrewInstall(w)
newStepMake(w, "EXPECTED_XCODE_VERSION=14.2 ios")
newStepUploadArtifacts(w, artifacts)
Expand Down
1 change: 0 additions & 1 deletion internal/cmd/ghgen/linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ func buildAndPublishCLILinux(w io.Writer, job *Job) {
default:
newSetupInstallQemuUserStatic(w)
}
newStepSetupPsiphon(w)
newStepSetupGo(w, fmt.Sprintf("linux-%s", arch))
newStepSetupLinuxDockerGoCache(w, arch)
newStepMake(w, fmt.Sprintf("CLI/linux-static-%s", arch))
Expand Down
1 change: 0 additions & 1 deletion internal/cmd/ghgen/macos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ func buildAndPublishCLIMacOS(w io.Writer, job *Job) {
newJob(w, buildJob, runsOnMacOS, noDependencies, noPermissions)
newStepCheckout(w)
newStepSetupGo(w, "macos")
newStepSetupPsiphon(w)
newStepMake(w, "CLI/darwin")
newStepUploadArtifacts(w, artifacts)

Expand Down
1 change: 0 additions & 1 deletion internal/cmd/ghgen/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func buildAndPublishCLIWindows(w io.Writer, job *Job) {
newStepCheckout(w)
newStepSetupGo(w, "windows")
newStepInstallMingwW64(w)
newStepSetupPsiphon(w)
newStepMake(w, "EXPECTED_MINGW_W64_VERSION=\"10-win32\" CLI/windows")

newStepUploadArtifacts(w, artifacts)
Expand Down
Loading