diff --git a/.github/workflows/ghcr_build_latest_on_push.yml b/.github/workflows/ghcr_build_latest_on_push.yml deleted file mode 100644 index a68e335..0000000 --- a/.github/workflows/ghcr_build_latest_on_push.yml +++ /dev/null @@ -1,42 +0,0 @@ -on: - push: - branches: [master] - -jobs: - docker: - runs-on: ubuntu-latest - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - push: true - tags: ghcr.io/${{ github.repository }}:latest - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/ghcr_publish_on_release_tag.yml b/.github/workflows/ghcr_publish_on_release_tag.yml index adafeb1..e42332b 100644 --- a/.github/workflows/ghcr_publish_on_release_tag.yml +++ b/.github/workflows/ghcr_publish_on_release_tag.yml @@ -9,7 +9,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} diff --git a/README.md b/README.md index 566b563..ce80807 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,14 @@ # release -- create `py-${PYTHON_VERSION}-${YEAR}-${QUARTER}` branch -- update `Dockerfile` source image python version -- update `requirements.txt` from [data-setup specs/releases/glovebox.txt](https://github.com/lewagon/data-setup/blob/master/specs/releases/glovebox.txt) -- push branch +- update `Dockerfile` source image python version / `requirements.txt` +- make sure it builds +- TODO update `requirements.txt` from [data-setup specs/releases/glovebox.txt](https://github.com/lewagon/data-setup/blob/master/specs/releases/glovebox.txt) +- create tag / push commit - draft a `release` (which triggers the `ghcr_publish_on_release_tag` GHA) - update `data-solutions` glovebox image - update `active_admin` programs to use the image -## draft a `release` - -[draft a new release](https://github.com/lewagon/data-runner/releases): -- choose a tag: use `${BRANCH_NAME}-v1` (ignore branch/tag naming confusion warning) / create -- choose a target: use `${BRANCH_NAME}` -- release title: use `${BRANCH_NAME}-v1` -- description: ... -- publish release - list container images: ``` bash @@ -26,7 +17,7 @@ gh release list --repo lewagon/data-runner ## update `data-solutions` glovebox image -[edit data-solutions/test-solutions-action/Dockerfile](https://github.com/lewagon/data-solutions/blob/master/test-solutions-action/Dockerfile): +TODO [edit data-solutions/test-solutions-action/Dockerfile](https://github.com/lewagon/data-solutions/blob/master/test-solutions-action/Dockerfile): - replace `FROM ghcr.io/lewagon/data-runner:$TAG_NAME` ## update `active_admin` programs to use the image @@ -54,7 +45,6 @@ gh release list --repo lewagon/data-runner ``` bash .github/workflows/ghcr_publish_on_release_tag.yml # publication GHA -.github/workflows/ghcr_build_latest_on_push.yml # unused ? (no push/merge on master) ``` # source diff --git a/requirements.txt b/requirements.txt index 4a6c415..3de83f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ matplotlib==3.5.3 matplotlib-inline==0.1.6 mccabe==0.6.1 memoized-property==1.0.3 -nbresult==0.0.8 +nbresult==0.1.0 numpy==1.23.4 packaging==21.3 pandas==1.4.4 @@ -49,7 +49,7 @@ pyparsing==3.0.9 pytest==7.1.3 python-dateutil==2.8.2 pytz==2022.1 -PyYAML==5.4.1 +PyYAML==6.0.1 requests==2.28.1 scikit-learn==1.1.2 scipy==1.8.1