diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ca94399fc..2a365eb14 100644 --- a/.github/workflows/android.yml +++ b/.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 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index a56cf2e6c..4b08ef72b 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -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 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b88b72ef8..5e9d95f77 100644 --- a/.github/workflows/linux.yml +++ b/.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" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 409269b60..c79cd643d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index db027d0db..20e67ce69 100644 --- a/.github/workflows/windows.yml +++ b/.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 diff --git a/internal/cmd/ghgen/android.go b/internal/cmd/ghgen/android.go index 5bcc33577..d0a981058 100644 --- a/internal/cmd/ghgen/android.go +++ b/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) diff --git a/internal/cmd/ghgen/ios.go b/internal/cmd/ghgen/ios.go index 2a0068419..31bb4fc38 100644 --- a/internal/cmd/ghgen/ios.go +++ b/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) diff --git a/internal/cmd/ghgen/linux.go b/internal/cmd/ghgen/linux.go index 597337203..c39741122 100644 --- a/internal/cmd/ghgen/linux.go +++ b/internal/cmd/ghgen/linux.go @@ -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)) diff --git a/internal/cmd/ghgen/macos.go b/internal/cmd/ghgen/macos.go index 6f7e30e14..2eab7474c 100644 --- a/internal/cmd/ghgen/macos.go +++ b/internal/cmd/ghgen/macos.go @@ -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) diff --git a/internal/cmd/ghgen/windows.go b/internal/cmd/ghgen/windows.go index 4b13f0ae0..2b72fd346 100644 --- a/internal/cmd/ghgen/windows.go +++ b/internal/cmd/ghgen/windows.go @@ -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)