diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 3b84258..a055ece 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -32,7 +32,13 @@ jobs: - name: Build shared-utils run: npm run shared-utils-build - + + - name: Save public env variables into .env file + run: | + echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env + echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env + echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env + - name: Install web dependencies run: npm install --workspace=web diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml index 8c3b37a..5badb0c 100644 --- a/.github/workflows/build-mobile.yml +++ b/.github/workflows/build-mobile.yml @@ -31,22 +31,11 @@ jobs: java-version: "21" distribution: "temurin" - - name: Install Android SDK Command Line Tools - run: | - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools - cd $ANDROID_SDK_ROOT/cmdline-tools - wget https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O commandlinetools.zip - unzip commandlinetools.zip - rm commandlinetools.zip - mv cmdline-tools latest - echo "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_PATH - echo "$ANDROID_SDK_ROOT/platform-tools" >> $GITHUB_PATH + - name: Setup Android SDK + uses: android-actions/setup-android@v3 - name: Install Android SDK build tools run: | - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - yes | sdkmanager --licenses sdkmanager "build-tools;${{env.ANDROID_SDK_VERSION}}" echo "$ANDROID_SDK_ROOT/build-tools/${{env.ANDROID_SDK_VERSION}}" >> $GITHUB_PATH @@ -69,6 +58,12 @@ jobs: - name: Install web dependencies run: npm install --workspace=web + - name: Save public env variables into .env file + run: | + echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env + echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env + echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env + - name: Build Web App run: npm run web-build @@ -83,8 +78,5 @@ jobs: working-directory: mobile - name: Build Capacitor App - run: | - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - unset ANDROID_HOME - npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK + run: npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK working-directory: mobile diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index d53700e..3ac408f 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -32,6 +32,12 @@ jobs: - name: Install web dependencies run: npm install --workspace=web + - name: Save public env variables into .env file + run: | + echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env + echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env + echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env + - name: Build web app run: | npm run web-build diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index a580031..11e8db8 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -41,6 +41,12 @@ jobs: run: npm run rebuild-native working-directory: desktop + - name: Save public env variables into .env file + run: | + echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env + echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env + echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env + - name: Build Electron App run: | npm run desktop-build diff --git a/.github/workflows/release-mobile.yml b/.github/workflows/release-mobile.yml index 24df7df..a2dcd9e 100644 --- a/.github/workflows/release-mobile.yml +++ b/.github/workflows/release-mobile.yml @@ -28,22 +28,11 @@ jobs: java-version: "21" distribution: "temurin" - - name: Install Android SDK Command Line Tools - run: | - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools - cd $ANDROID_SDK_ROOT/cmdline-tools - wget https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O commandlinetools.zip - unzip commandlinetools.zip - rm commandlinetools.zip - mv cmdline-tools latest - echo "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_PATH - echo "$ANDROID_SDK_ROOT/platform-tools" >> $GITHUB_PATH + - name: Setup Android SDK + uses: android-actions/setup-android@v3 - name: Install Android SDK build tools run: | - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - yes | sdkmanager --licenses sdkmanager "build-tools;${{env.ANDROID_SDK_VERSION}}" echo "$ANDROID_SDK_ROOT/build-tools/${{env.ANDROID_SDK_VERSION}}" >> $GITHUB_PATH @@ -66,6 +55,12 @@ jobs: - name: Install web dependencies run: npm install --workspace=web + - name: Save public env variables into .env file + run: | + echo NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL >> ./web/.env + echo NEXT_PUBLIC_CDN_URL=$NEXT_PUBLIC_CDN_URL >> ./web/.env + echo NEXT_PUBLIC_STORAGE_CONTAINER=$NEXT_PUBLIC_STORAGE_CONTAINER >> ./web/.env + - name: Build Web App run: npm run web-build @@ -80,10 +75,7 @@ jobs: working-directory: mobile - name: Build Capacitor App - run: | - export ANDROID_SDK_ROOT=$HOME/Android/Sdk - unset ANDROID_HOME - npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK + run: npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK working-directory: mobile - name: Move APK