chore: sunset psiphon support (#1762)

## Checklist

- [x] I have read the [contribution
guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md)
- [x] reference issue for this pull request: #1761 
- [ ] if you changed anything related to how experiments work and you
need to reflect these changes in the ooni/spec repository, please link
to the related ooni/spec pull request: <!-- add URL here -->
- [ ] if you changed code inside an experiment, make sure you bump its
version number

<!-- Reminder: Location of the issue tracker:
https://github.com/ooni/probe -->

## Description

This diff removes support for psiphon be removing the psiphon
configuration file from the probe engine builds

Author: DecFox

.github/workflows/android.yml

@@ -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

.github/workflows/desktop.yml

@@ -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

.github/workflows/ios.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build_ios_mobile:
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
@@ -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
 

.github/workflows/linux.yml

@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

.github/workflows/macos.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build_darwin_cli:
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
@@ -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
@@ -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
@@ -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

.github/workflows/netxlite.yml

@@ -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

.github/workflows/windows.yml

@@ -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

internal/cmd/ghgen/android.go

@@ -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)
 

internal/cmd/ghgen/config.go

@@ -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"

internal/cmd/ghgen/ios.go

@@ -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)