Yuki Takei 3 年 前
コミット
b496a189af

+ 3 - 3
.github/workflows/release-rc.yml

@@ -47,7 +47,7 @@ jobs:
 
 
   publish-image-rc:
-    needs: determine-tags
+    needs: [determine-tags, build-image-rc]
 
     strategy:
       matrix:
@@ -60,5 +60,5 @@ jobs:
       image-name: weseek/growi-codebuild-test
       tag-temporary: latest-rc
     secrets:
-      DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
-      DOCKER_REGISTRY_ON_GITHUB_PASSWORD: ${{ secrets.DOCKER_REGISTRY_ON_GITHUB_PASSWORD }}
+      DOCKER_REGISTRY_PASSWORD: ${{ (startsWith(matrix.registry, 'docker') && secrets.DOCKER_REGISTRY_PASSWORD) || secrets.DOCKER_REGISTRY_ON_GITHUB_PASSWORD }}
+

+ 1 - 3
.github/workflows/reusable-app-create-manifests.yml

@@ -18,8 +18,6 @@ on:
     secrets:
       DOCKER_REGISTRY_PASSWORD:
         required: true
-      DOCKER_REGISTRY_ON_GITHUB_PASSWORD:
-        required: true
 
 
 
@@ -46,7 +44,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: wsmoogle
-        password: ${{ (startsWith(matrix.registry, 'docker') && secrets.DOCKER_REGISTRY_PASSWORD) || secrets.DOCKER_REGISTRY_ON_GITHUB_PASSWORD }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
 
     - name: Create and push manifest images
       uses: Noelware/docker-manifest-action@master