diff --git a/.github/workflows/deploy-to-staging.yaml b/.github/workflows/deploy-to-staging.yaml index c041d210d..275cfcc46 100644 --- a/.github/workflows/deploy-to-staging.yaml +++ b/.github/workflows/deploy-to-staging.yaml @@ -1,6 +1,7 @@ name: Deploy images to staging hubs # use echo ${VAR##*: } to get the value of a variable that is a string with a colon in it on: + workflow_dispatch: push: branches: - staging @@ -28,24 +29,31 @@ jobs: with: fetch-depth: 0 # OR "2" -> To retrieve the preceding commit. + - name: print out labels just for testing + run: echo "${{ steps.pr-labels.outputs.labels }}" + - name: Install dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt pip install --force-reinstall git+https://github.com/shaneknapp/hubploy.git@major-refactor + hubploy --help + hubploy deploy --help - - name: Install Google Cloud SDK - uses: google-github-actions/setup-gcloud@v0.2.0 + - name: Auth to gcloud + uses: google-github-actions/auth@v2 with: + credentials_json: ${{ secrets.GCP_SA_KEY }} project_id: ${{ secrets.GCP_PROJECT_ID }} - service_account_key: ${{ secrets.GCP_SA_KEY }} - export_default_credentials: true + + - name: Install Google Cloud SDK + uses: google-github-actions/setup-gcloud@v2 + + - name: gcloud info + run: gcloud info - name: Install SOPS run: | - echo $SOPS_ACCOUNT_KEY > ${HOME}/repo/sops.key - echo 'export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/repo/sops.key' >> ${BASH_ENV} mkdir -p ${HOME}/repo/bin curl -sSL https://github.com/mozilla/sops/releases/download/v3.7.0/sops-v3.7.0.linux -o ${HOME}/repo/bin/sops chmod 755 ${HOME}/repo/bin/sops - echo 'export PATH="${HOME}/repo/bin:${PATH}"' >> ${BASH_ENV} \ No newline at end of file diff --git a/deployments/logodev/hubploy.yaml b/deployments/logodev/hubploy.yaml index 36e817577..fd2b36d2a 100644 --- a/deployments/logodev/hubploy.yaml +++ b/deployments/logodev/hubploy.yaml @@ -2,11 +2,6 @@ images: images: # temporary update - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:829f9eaececd - registry: - provider: gcloud - gcloud: - project: ucb-datahub-2018 - service_key: gcr-key.json cluster: provider: gcloud