From 2a6c7973358f2f3980a6d897d9c229dd557cd69e Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 10 Jun 2024 14:49:10 -0700 Subject: [PATCH 1/3] whee --- .github/workflows/build.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ff2281c..3e5a756 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,19 +26,17 @@ jobs: - name: Checkout files in repo uses: actions/checkout@main - - name: can we even see the secrets? + - name: Log in to GAR + uses: docker/login-action@v1 with: - S: $ {{ secrets.GAR_SECRET_KEY }} - run: | - echo "can we access the secrets..." - if [ -z ${S} ]; then echo "nope!"; else echo "yep!"; fi + registry: us-central1-docker.pkg.dev + username: _json_key + password: ${{ secrets.GCP_SA_KEY }} - - name: Build the image and push to artifact registry if not a pull request + - name: Build the image and push to artifact registry uses: jupyterhub/repo2docker-action@master with: # Make sure username & password/token pair matches your registry credentials - DOCKER_USERNAME: _json_key - DOCKER_PASSWORD: $ {{ secrets.GAR_SECRET_KEY }} DOCKER_REGISTRY: us-central1-docker.pkg.dev IMAGE_NAME: ucb-datahub-2018/user-images/logodev-user-image # Disable pushing a 'latest' tag, as this often just causes confusion From cf1a1dc48bee9ade548c6c1b902678097a9248f3 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 10 Jun 2024 14:50:48 -0700 Subject: [PATCH 2/3] fixing variable name --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3e5a756..68e13d0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,7 +31,7 @@ jobs: with: registry: us-central1-docker.pkg.dev username: _json_key - password: ${{ secrets.GCP_SA_KEY }} + password: ${{ secrets.GAR_SECRET_KEY }} - name: Build the image and push to artifact registry uses: jupyterhub/repo2docker-action@master From df89ed00798fb42c7cd7e5e88f1d86f71ce90334 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 10 Jun 2024 14:52:29 -0700 Subject: [PATCH 3/3] minor fixes --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cabf655..c648c8c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ jobs: # https://github.com/actions/virtual-environments/issues/2606#issuecomment-772683150 # and https://github.com/easimon/maximize-build-space/blob/b4d02c14493a9653fe7af06cc89ca5298071c66e/action.yml#L104 # This gives us a total of about 52G of free space, which should be enough for now - - name: cleanup disk space + - name: Cleanup disk space run: | sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc df -h @@ -24,7 +24,7 @@ jobs: - name: Checkout files in repo uses: actions/checkout@main - - name: Build the image and push to artifact registry if not a pull request + - name: Build and test the image uses: jupyterhub/repo2docker-action@master with: # Make sure username & password/token pair matches your registry credentials