diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 1736c8b..f7bcdc8 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -12,8 +12,8 @@ env: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_ORGANIZATION: ${{ secrets.DOCKER_ORGANIZATION }} PROJECT_ID: ${{ secrets.GKE_PROJECT }} - GKE_CLUSTER: wisp-prod - GKE_ZONE: northamerica-northeast1-c + GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }} + GKE_ZONE: ${{ secrets.GKE_ZONE }} IMAGE: wisp-problems jobs: @@ -26,7 +26,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - # Setup gcloud CLI + # Setup gcloud CLI - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: service_account_key: ${{ secrets.GKE_SA_KEY }} diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml index 94fb4a7..63bc892 100644 --- a/.github/workflows/prod.yaml +++ b/.github/workflows/prod.yaml @@ -12,8 +12,8 @@ env: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_ORGANIZATION: ${{ secrets.DOCKER_ORGANIZATION }} PROJECT_ID: ${{ secrets.GKE_PROJECT }} - GKE_CLUSTER: wisp-prod - GKE_ZONE: northamerica-northeast1-c + GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }} + GKE_ZONE: ${{ secrets.GKE_ZONE }} IMAGE: wisp-problems jobs: diff --git a/.prettierrc.js b/.prettierrc.js index 9831d86..94825f9 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,6 +1,14 @@ module.exports = { - semi: true, - trailingComma: "none", - singleQuote: false, - tabWidth: 4 -}; \ No newline at end of file + semi: true, + trailingComma: "none", + singleQuote: false, + tabWidth: 4, + overrides: [ + { + files: ["*.yaml"], + options: { + tabWidth: 2 + } + } + ] +};