Merge pull request #446 from krille-chan/krille/better-flutter-setup-…

…in-ci CI: Better Flutter setup
krille-chan · Jul 15, 2023 · 55066a2 · 55066a2
2 parents 9e0f9f5 + 1f53f5e
commit 55066a2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -2,18 +2,12 @@ name: Pull Request Workflow
 
 on: [pull_request]
 
-env:
-  FLUTTER_VERSION: ${{ secrets.FLUTTER_VERSION }}
-  JAVA_VERSION: ${{ secrets.JAVA_VERSION }}
-
 jobs:
   code_tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -32,6 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}
@@ -45,9 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -63,9 +56,7 @@ jobs:
         arch: [x64, arm64]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}

diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml
@@ -9,18 +9,12 @@ concurrency:
   group: main_deploy
   cancel-in-progress: true
 
-env:
-  FLUTTER_VERSION: ${{ secrets.FLUTTER_VERSION }}
-  JAVA_VERSION: ${{ secrets.JAVA_VERSION }}
-
 jobs:
   deploy_web:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -48,6 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,18 +9,12 @@ concurrency:
   group: release_workflow
   cancel-in-progress: true
 
-env:
-  FLUTTER_VERSION: ${{ secrets.FLUTTER_VERSION }}
-  JAVA_VERSION: ${{ secrets.JAVA_VERSION }}
-
 jobs:
   build_web:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -39,6 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}
@@ -63,9 +58,7 @@ jobs:
         arch: [x64, arm64]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -104,6 +97,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
       - uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env
@@ -0,0 +1,2 @@
+FLUTTER_VERSION=3.10.6
+JAVA_VERSION=17