ci: Fix wrong env name (openfoodfacts#2818)

* ci: Fix ci cache key * ci: Fix wrong env name
AshAman999 · Aug 21, 2022 · 5399834 · 5399834
1 parent 799d617
commit 5399834
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
@@ -33,6 +33,8 @@ on:
         required: true
       SPACESHIP_CONNECT_API_KEY_ID:
         required: true
+      AUTH_KEY_FILE_DECRYPTKEY:
+        required: true
 
 env:
   JAVA_VERSION: 17

diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - "develop"
+
+env:
+  FLUTTER_VERSION: '3.0.x'
 
 jobs:
   build:
@@ -21,13 +24,12 @@ jobs:
           distribution: 'zulu'
           java-version: 11
 
-      # Setup flutter
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
           channel: stable
           cache: true
-          cache-key: flutter3.0.1 # change this to force refresh cache
+          cache-key: flutter-${{ env.FLUTTER_VERSION }}-${{ hashFiles('**/pubspec.lock')}}
 
       - run: flutter --version
 

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -54,13 +54,13 @@ jobs:
           subdirectory: packages/smooth_app/android
 
       - name: Version
-        run: echo ${{ env.RELEASE_VERSION }}
+        run: echo ${{ env.VERSION_NAME }}
 
       - name: Tag commit
         uses: rickstaa/action-create-tag@v1
         with:
-          tag: ${{ env.RELEASE_VERSION }}
-          message: "Release: ${{ env.RELEASE_VERSION }}"
+          tag: ${{ env.VERSION_NAME }}
+          message: "Release: ${{ env.VERSION_NAME }}+${{ env.OLD_VERSION_CODE }} (+1)"
 
       - name: Set output
         id: set_output
@@ -77,10 +77,10 @@ jobs:
     secrets:
       API_JSON_FILE_DECRYPTKEY: ${{secrets.API_JSON_FILE_DECRYPTKEY }}
       DECRYPT_GPG_KEYSTORE: ${{secrets.DECRYPT_GPG_KEYSTORE }}
-      STORE_JKS_DECRYPTKEY: ${{secrets.STORE_JKS_DECRYPTKEY }}
-      SIGN_STORE_PASSWORD: ${{secrets.SIGN_STORE_PASSWORD }}
-      SIGN_KEY_ALIAS: ${{secrets.SIGN_KEY_ALIAS }}
-      SIGN_KEY_PASSWORD: ${{secrets.SIGN_KEY_PASSWORD }}
+      STORE_JKS_DECRYPTKEY: ${{secrets.NEW_CYPHER }}
+      SIGN_STORE_PASSWORD: ${{secrets.DECRYPT_FOR_SCANNER_FILE }}
+      SIGN_KEY_ALIAS: ${{secrets.ALIAS_FOR_SCANNER }}
+      SIGN_KEY_PASSWORD: ${{secrets.KEY_FOR_SCANNER }}
 
   iOS-release:
     uses: openfoodfacts/smooth-app/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml@develop
@@ -101,3 +101,4 @@ jobs:
       PILOT_APPLE_ID: ${{secrets.PILOT_APPLE_ID }}
       SPACESHIP_CONNECT_API_ISSUER_ID: ${{secrets.SPACESHIP_CONNECT_API_ISSUER_ID }}
       SPACESHIP_CONNECT_API_KEY_ID: ${{secrets.SPACESHIP_CONNECT_API_KEY_ID }}
+      AUTH_KEY_FILE_DECRYPTKEY: ${{ secrets.AUTH_KEY_FILE_DECRYPTKEY }}