From 4f6466fd1d2106850df32be6d7ef46e4ea3aa9fc Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 16 Jul 2024 13:22:15 -0700 Subject: [PATCH 1/5] debump pandas --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index ac359d7..287161b 100644 --- a/environment.yml +++ b/environment.yml @@ -23,7 +23,7 @@ dependencies: - matplotlib==3.7.1 - mdit-py-plugins==0.4.0 - numpy==1.24.2 -- pandas==2.2.2 +- pandas==2.0.2 - plotly==5.13.1 - requests==2.28.2 - scikit-image==0.19.3 From 174d9bee5494c7780df37278365566daa8656649 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 16 Jul 2024 15:39:28 -0700 Subject: [PATCH 2/5] WIP will probably fail --- .github/workflows/build-and-push.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 863beaa..bd0be10 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -1,5 +1,5 @@ name: Build and push container image - +# try to follow the example here: https://gist.github.com/Daniel-ltw/552b90800b07c22e4a83dfa68ada6318 on: push: branches: @@ -11,7 +11,8 @@ jobs: env: DOCKER_CONFIG: $HOME/.docker HUB: ${{ vars.HUB }} - + outputs: + image-name: ${{ steps.build-and-push.outputs.image-name }} steps: - name: Generate the image name run: | @@ -53,20 +54,24 @@ jobs: password: ${{ secrets.GAR_SECRET_KEY }} - name: Build the image and push to artifact registry + id: build-and-push if: steps.changed-files.outputs.any_changed == 'true' uses: jupyterhub/repo2docker-action@master with: # Make sure username & password/token pair matches your registry credentials DOCKER_REGISTRY: us-central1-docker.pkg.dev - IMAGE_NAME: ucb-datahub-2018/user-images/${IMAGE} + IMAGE_NAME: ${IMAGE} # Disable pushing a 'latest' tag, as this often just causes confusion - # LATEST_TAG_OFF: true + LATEST_TAG_OFF: true # Put repo contents in /srv/repo, rather than the default (/home/jovyan). The home directory # is mounted over by persistent storage when we are using the built image in a JupyterHub, and # so all contents put in /home/jovyan are lost. This particularly prevents any 'start' script from # working, as it is needed in runtime. REPO_DIR: /srv/repo + - name: Store the image name + id: store-image-name + # Lets us monitor disks getting full as images get bigger over time - name: Show how much disk space is left run: df -h From 052e0037298d72cfc7178eb75e079a5ee5a6fe25 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 22 Jul 2024 15:02:20 -0700 Subject: [PATCH 3/5] more testing --- .github/workflows/build-and-push.yaml | 7 ++++--- .github/workflows/open-datahub-pr.yaml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index bd0be10..7cba6b0 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -12,7 +12,7 @@ jobs: DOCKER_CONFIG: $HOME/.docker HUB: ${{ vars.HUB }} outputs: - image-name: ${{ steps.build-and-push.outputs.image-name }} + image-tag: ${{ steps.build-and-push.outputs.image-tag }} steps: - name: Generate the image name run: | @@ -69,8 +69,9 @@ jobs: # working, as it is needed in runtime. REPO_DIR: /srv/repo - - name: Store the image name - id: store-image-name + - name: print the image name + run: | + echo ${{ steps.build-and-push.outputs.IMAGE_SHA_TAG }} # Lets us monitor disks getting full as images get bigger over time - name: Show how much disk space is left diff --git a/.github/workflows/open-datahub-pr.yaml b/.github/workflows/open-datahub-pr.yaml index f70bd18..00b4939 100644 --- a/.github/workflows/open-datahub-pr.yaml +++ b/.github/workflows/open-datahub-pr.yaml @@ -8,6 +8,7 @@ on: jobs: create-pr: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest env: HUB: ${{ vars.HUB }} @@ -22,9 +23,9 @@ jobs: - name: Test if vars works run: | echo "with vars:" - echo ${{ vars.HUB }} + echo ${{ vars.IMAGE }} echo "no vars:" - echo ${HUB} + echo ${IMAGE} - name: Maximize build space uses: easimon/maximize-build-space@master From bd0eb5bfbc843c0105321b0444db6bf708ddf3c4 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 22 Jul 2024 15:08:02 -0700 Subject: [PATCH 4/5] now we run out of disk space? --- .github/workflows/build-and-push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 7cba6b0..9135c38 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -26,9 +26,9 @@ jobs: - name: Maximize build space if: steps.changed-files.outputs.any_changed == 'true' - uses: easimon/maximize-build-space@master + uses: easimon/maximize-build-space@v10 with: - root-reserve-mb: 512 + root-reserve-mb: 1024 swap-size-mb: 1024 remove-dotnet: 'true' From 364b09acac5642ccfb63099618972690c512f835 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 22 Jul 2024 15:10:22 -0700 Subject: [PATCH 5/5] dont build image rn --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 287161b..ac359d7 100644 --- a/environment.yml +++ b/environment.yml @@ -23,7 +23,7 @@ dependencies: - matplotlib==3.7.1 - mdit-py-plugins==0.4.0 - numpy==1.24.2 -- pandas==2.0.2 +- pandas==2.2.2 - plotly==5.13.1 - requests==2.28.2 - scikit-image==0.19.3