diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 387c53b..b988be7 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -16,17 +16,11 @@ jobs: distribution: temurin java-version: "17" - - name: Set up Flutter and Android SDK from nix store + - name: Set up Android SDK from nix store run: | - FLUTTER=$(find /nix/store -maxdepth 2 -name "flutter-wrapped-*-sdk-links" -type d 2>/dev/null | sort -V | tail -1) - echo "${FLUTTER}/bin" >> $GITHUB_PATH - echo "FLUTTER_ROOT=$FLUTTER" >> $GITHUB_ENV - ANDROID_SDK=$(find /nix/store -maxdepth 3 -path "*/android-sdk-env/share/android-sdk" -type d 2>/dev/null | sort | tail -1) echo "ANDROID_HOME=$ANDROID_SDK" >> $GITHUB_ENV echo "ANDROID_SDK_ROOT=$ANDROID_SDK" >> $GITHUB_ENV - - echo "Flutter: $FLUTTER" echo "Android SDK: $ANDROID_SDK" - name: Extract version @@ -45,7 +39,7 @@ jobs: STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - run: flutter build apk --release --flavor prod + run: devbox run -- flutter build apk --release --flavor prod - name: Create Forgejo Release and upload APK env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 387c53b..b988be7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,17 +16,11 @@ jobs: distribution: temurin java-version: "17" - - name: Set up Flutter and Android SDK from nix store + - name: Set up Android SDK from nix store run: | - FLUTTER=$(find /nix/store -maxdepth 2 -name "flutter-wrapped-*-sdk-links" -type d 2>/dev/null | sort -V | tail -1) - echo "${FLUTTER}/bin" >> $GITHUB_PATH - echo "FLUTTER_ROOT=$FLUTTER" >> $GITHUB_ENV - ANDROID_SDK=$(find /nix/store -maxdepth 3 -path "*/android-sdk-env/share/android-sdk" -type d 2>/dev/null | sort | tail -1) echo "ANDROID_HOME=$ANDROID_SDK" >> $GITHUB_ENV echo "ANDROID_SDK_ROOT=$ANDROID_SDK" >> $GITHUB_ENV - - echo "Flutter: $FLUTTER" echo "Android SDK: $ANDROID_SDK" - name: Extract version @@ -45,7 +39,7 @@ jobs: STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - run: flutter build apk --release --flavor prod + run: devbox run -- flutter build apk --release --flavor prod - name: Create Forgejo Release and upload APK env: