diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index ce96b903c..660c394ea 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -9,10 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - run: flutter pub get - run: flutter gen-l10n @@ -32,14 +31,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: actions/setup-java@v4 with: - java-version: ${{ env.JAVA_VERSION }} + java-version: 17 distribution: "zulu" - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - run: flutter pub get - run: flutter build apk --debug @@ -48,10 +46,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - run: flutter pub get - name: Prepare web @@ -65,9 +62,10 @@ jobs: runs-on: ${{ matrix.arch == 'arm64' && 'self-hosted' || 'ubuntu-latest'}} steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - name: Install dependencies run: sudo apt-get update && sudo apt-get install git wget curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev libwebkit2gtk-4.1-dev -y + - uses: chrisdickinson/setup-yq@latest + - run: FLUTTER_VERSION=$(yq e '.environment.flutter' pubspec.yaml) - name: Install Flutter run: | git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git @@ -79,10 +77,9 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Setup Xcode version uses: maxim-lobanov/setup-xcode@v1.6.0 diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index 1a817f006..e82c7ddaa 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -14,11 +14,10 @@ jobs: deploy_web: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml - name: Remove Emoji Font run: | rm -rf fonts/NotoEmoji @@ -41,14 +40,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: actions/setup-java@v4 with: - java-version: ${{ env.JAVA_VERSION }} + java-version: 17 distribution: 'zulu' - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Set up Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aed76cd8e..b225b1bc7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,10 +18,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Install dependencies run: sudo apt-get update && sudo apt-get install nodejs -y @@ -70,14 +69,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: actions/setup-java@v4 with: - java-version: ${{ env.JAVA_VERSION }} + java-version: 17 distribution: 'zulu' - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Apply Google Services Patch run: git apply ./scripts/enable-android-google-services.patch @@ -110,9 +108,10 @@ jobs: runs-on: ${{ matrix.arch == 'arm64' && 'self-hosted' || 'ubuntu-latest'}} steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - name: Install dependencies run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev libwebkit2gtk-4.1-dev -y + - uses: chrisdickinson/setup-yq@latest + - run: FLUTTER_VERSION=$(yq e '.environment.flutter' pubspec.yaml) - name: Install Flutter run: | git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git @@ -135,14 +134,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: actions/setup-java@v4 with: - java-version: ${{ env.JAVA_VERSION }} + java-version: 17 distribution: 'zulu' - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Set up Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env deleted file mode 100644 index c0c442ad6..000000000 --- a/.github/workflows/versions.env +++ /dev/null @@ -1,2 +0,0 @@ -FLUTTER_VERSION=3.27.1 -JAVA_VERSION=17 diff --git a/pubspec.yaml b/pubspec.yaml index 87c27e566..9dbc16171 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,6 +6,7 @@ version: 1.23.0+3536 environment: sdk: ">=3.0.0 <4.0.0" + flutter: 3.27.1 dependencies: animations: ^2.0.11