Merge pull request builttoroam#352 from thomassth/clean-up

Updating CI/CD
tungakanui · Nov 12, 2021 · fb3496a · fb3496a
2 parents 32ab214 + 1a27bca
commit fb3496a
Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -21,18 +21,14 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      - name: Get Changelog Entry
-        id: changelog_reader
-        # uses: mindsers/changelog-reader-action@e1a36842bddbd512340f882735802de843998e1f
-        uses: mindsers/changelog-reader-action@v2.0.0
+      - uses: subosito/flutter-action@v1
+        with:
+          channel: "stable"
+      - run: dart --version
+      - run: flutter --version
       - name: Edit pubspec.ymal for dev release
         run: |
-          sed  -i "s/version.*/&+$GITHUB_RUN_ID/" pubspec.yaml
-      - name: Add entry to Github release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ steps.changelog_reader.outputs.version }}+${{ github.run_id }}
-          prerelease: true
+          sed  -i "s/version.*/&-$GITHUB_RUN_ID/" pubspec.yaml
       - name: Fetch credentials for publish
         run: |
           content=`cat ~/.pub-cache/credentials.json`
@@ -43,3 +39,11 @@ jobs:
           flutter_package: true
           skip_test: false
           dry_run: true
+      - name: Get Changelog Entry
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v2.0.0
+      - name: Add entry to Github release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.changelog_reader.outputs.version }}+${{ github.run_id }}
+          prerelease: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,15 +20,11 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      - name: Get Changelog Entry
-        id: changelog_reader
-        # uses: mindsers/changelog-reader-action@e1a36842bddbd512340f882735802de843998e1f
-        uses: mindsers/changelog-reader-action@v2.0.0
-      - name: Add entry to Github release
-        uses: softprops/action-gh-release@v1
+      - uses: subosito/flutter-action@v1
         with:
-          tag_name: ${{ steps.changelog_reader.outputs.version }}
-          body: ${{ steps.changelog_reader.outputs.changes }}
+          channel: "stable"
+      - run: dart --version
+      - run: flutter --version
       - name: Fetch credentials for publish
         run: |
           content=`cat ~/.pub-cache/credentials.json`
@@ -39,3 +35,11 @@ jobs:
           flutter_package: true
           skip_test: false
           dry_run: true
+      - name: Get Changelog Entry
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v2.0.0
+      - name: Add entry to Github release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.changelog_reader.outputs.version }}
+          body: ${{ steps.changelog_reader.outputs.changes }}