diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 216f75b5c3..71d7dc2981 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -11,8 +11,10 @@ concurrency: env: ENVIRONMENT: production + PROJECT: cloud + APPLICATION: cloud DECLARATIVE_OWNER: appwrite-labs - DECLARATIVE_REPOSITORY: cloud-applications + DECLARATIVE_REPOSITORY: application-configuration DECLARATIVE_ALIAS: cloud-console IMAGE_NAME: appwrite/console-cloud TAG: ${{ github.event.release.tag_name || github.sha }} @@ -54,7 +56,7 @@ jobs: needs: build runs-on: ubuntu-latest # Shared across the staging and production workflows so their deploy - # jobs never push to cloud-applications at the same time. + # jobs never push to application-configuration at the same time. concurrency: group: declarative-deploy cancel-in-progress: false @@ -77,7 +79,7 @@ jobs: persist-credentials: false - name: Update image tag - run: yq -i '.[strenv(DECLARATIVE_ALIAS)].image.tag = strenv(TAG)' ${{ env.ENVIRONMENT }}/cloud/default.yaml + run: yq -i '.[strenv(DECLARATIVE_ALIAS)].image.tag = strenv(TAG)' ${{ env.PROJECT }}/${{ env.ENVIRONMENT }}/${{ env.APPLICATION }}/default.yaml - name: Open pull request # The release author reviews; falls back to the dispatcher for @@ -90,7 +92,7 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git add ${{ env.ENVIRONMENT }}/cloud/default.yaml + git add ${{ env.PROJECT }}/${{ env.ENVIRONMENT }}/${{ env.APPLICATION }}/default.yaml if git diff --cached --quiet; then echo "No changes to commit" exit 0 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 5ba4e204bb..b7dc185d13 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -12,8 +12,10 @@ concurrency: env: ENVIRONMENT: staging + PROJECT: cloud + APPLICATION: cloud DECLARATIVE_OWNER: appwrite-labs - DECLARATIVE_REPOSITORY: cloud-applications + DECLARATIVE_REPOSITORY: application-configuration DECLARATIVE_ALIAS: cloud-console IMAGE_NAME: appwrite/console-cloud-stage TAG: ${{ github.sha }} @@ -54,7 +56,7 @@ jobs: needs: build runs-on: ubuntu-latest # Shared across the staging and production workflows so their deploy - # jobs never push to cloud-applications at the same time. + # jobs never push to application-configuration at the same time. concurrency: group: declarative-deploy cancel-in-progress: false @@ -77,7 +79,7 @@ jobs: persist-credentials: false - name: Update image tag - run: yq -i '.[strenv(DECLARATIVE_ALIAS)].image.tag = strenv(TAG)' ${{ env.ENVIRONMENT }}/cloud/default.yaml + run: yq -i '.[strenv(DECLARATIVE_ALIAS)].image.tag = strenv(TAG)' ${{ env.PROJECT }}/${{ env.ENVIRONMENT }}/${{ env.APPLICATION }}/default.yaml - name: Commit and push env: @@ -85,7 +87,7 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git add ${{ env.ENVIRONMENT }}/cloud/default.yaml + git add ${{ env.PROJECT }}/${{ env.ENVIRONMENT }}/${{ env.APPLICATION }}/default.yaml if git diff --cached --quiet; then echo "No changes to commit" else