Skip to content

Commit d93c279

Browse files
authored
Merge pull request #102 from ClayPulse/hotfix
Add public envs to build workflow
2 parents afe9e8d + 405014d commit d93c279

File tree

5 files changed

+37
-35
lines changed

5 files changed

+37
-35
lines changed

.github/workflows/build-desktop.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ jobs:
3232

3333
- name: Build shared-utils
3434
run: npm run shared-utils-build
35-
35+
36+
- name: Save public env variables into .env file
37+
run: |
38+
echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env
39+
echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env
40+
echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env
41+
3642
- name: Install web dependencies
3743
run: npm install --workspace=web
3844

.github/workflows/build-mobile.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,11 @@ jobs:
3131
java-version: "21"
3232
distribution: "temurin"
3333

34-
- name: Install Android SDK Command Line Tools
35-
run: |
36-
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
37-
mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
38-
cd $ANDROID_SDK_ROOT/cmdline-tools
39-
wget https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O commandlinetools.zip
40-
unzip commandlinetools.zip
41-
rm commandlinetools.zip
42-
mv cmdline-tools latest
43-
echo "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_PATH
44-
echo "$ANDROID_SDK_ROOT/platform-tools" >> $GITHUB_PATH
34+
- name: Setup Android SDK
35+
uses: android-actions/setup-android@v3
4536

4637
- name: Install Android SDK build tools
4738
run: |
48-
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
49-
yes | sdkmanager --licenses
5039
sdkmanager "build-tools;${{env.ANDROID_SDK_VERSION}}"
5140
echo "$ANDROID_SDK_ROOT/build-tools/${{env.ANDROID_SDK_VERSION}}" >> $GITHUB_PATH
5241
@@ -69,6 +58,12 @@ jobs:
6958
- name: Install web dependencies
7059
run: npm install --workspace=web
7160

61+
- name: Save public env variables into .env file
62+
run: |
63+
echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env
64+
echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env
65+
echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env
66+
7267
- name: Build Web App
7368
run: npm run web-build
7469

@@ -83,8 +78,5 @@ jobs:
8378
working-directory: mobile
8479

8580
- name: Build Capacitor App
86-
run: |
87-
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
88-
unset ANDROID_HOME
89-
npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
81+
run: npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
9082
working-directory: mobile

.github/workflows/build-web.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ jobs:
3232
- name: Install web dependencies
3333
run: npm install --workspace=web
3434

35+
- name: Save public env variables into .env file
36+
run: |
37+
echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env
38+
echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env
39+
echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env
40+
3541
- name: Build web app
3642
run: |
3743
npm run web-build

.github/workflows/release-desktop.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ jobs:
4141
run: npm run rebuild-native
4242
working-directory: desktop
4343

44+
- name: Save public env variables into .env file
45+
run: |
46+
echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env
47+
echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env
48+
echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env
49+
4450
- name: Build Electron App
4551
run: |
4652
npm run desktop-build

.github/workflows/release-mobile.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,11 @@ jobs:
2828
java-version: "21"
2929
distribution: "temurin"
3030

31-
- name: Install Android SDK Command Line Tools
32-
run: |
33-
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
34-
mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
35-
cd $ANDROID_SDK_ROOT/cmdline-tools
36-
wget https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O commandlinetools.zip
37-
unzip commandlinetools.zip
38-
rm commandlinetools.zip
39-
mv cmdline-tools latest
40-
echo "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_PATH
41-
echo "$ANDROID_SDK_ROOT/platform-tools" >> $GITHUB_PATH
31+
- name: Setup Android SDK
32+
uses: android-actions/setup-android@v3
4233

4334
- name: Install Android SDK build tools
4435
run: |
45-
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
46-
yes | sdkmanager --licenses
4736
sdkmanager "build-tools;${{env.ANDROID_SDK_VERSION}}"
4837
echo "$ANDROID_SDK_ROOT/build-tools/${{env.ANDROID_SDK_VERSION}}" >> $GITHUB_PATH
4938
@@ -66,6 +55,12 @@ jobs:
6655
- name: Install web dependencies
6756
run: npm install --workspace=web
6857

58+
- name: Save public env variables into .env file
59+
run: |
60+
echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env
61+
echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env
62+
echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env
63+
6964
- name: Build Web App
7065
run: npm run web-build
7166

@@ -80,10 +75,7 @@ jobs:
8075
working-directory: mobile
8176

8277
- name: Build Capacitor App
83-
run: |
84-
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
85-
unset ANDROID_HOME
86-
npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
78+
run: npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
8779
working-directory: mobile
8880

8981
- name: Move APK

0 commit comments

Comments
 (0)