Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
7 changes: 0 additions & 7 deletions .github/workflows/ios.yml
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: "-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
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
7 changes: 0 additions & 7 deletions .github/workflows/macos.yml
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: "-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 Down
7 changes: 0 additions & 7 deletions .github/workflows/windows.yml
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
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
1 change: 0 additions & 1 deletion internal/cmd/ghgen/ios.go
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
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
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
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