WIP

Author: jiripetrlik

.github/workflows/image.yml

@@ -27,11 +27,7 @@ jobs:
             - name: Checkout the repository
               uses: actions/checkout@v3
             - name: Change version in pyproject.toml
-              uses: ciiiii/[email protected]
-              with:
-                file: "pyproject.toml"
-                key: "tool.poetry.version"
-                value: "${{ github.event.inputs.new_version }}"
+              run: sed -i "s/\(^version = \"\)\(.*\)\"/\1${{ github.event.inputs.new_version }}\"/" pyproject.toml
             - name: Install Python
               uses: actions/setup-python@v4
               with:
@@ -46,23 +42,37 @@ jobs:
               run: poetry build
             - name: Create new documentation
               run: poetry run pdoc --html -o docs src/codeflare_sdk && pushd docs && rm -rf cluster job utils && mv codeflare_sdk/* . && rm -rf codeflare_sdk && popd
-            - name: Set Pypi token
-              run: poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
-            - name: Publish new release to Pypi repository
-              run: poetry publish -r test-pypi
+#            - name: Set Pypi repository
+#              run: poetry config repositories.test-pypi https://test.pypi.org/legacy/
+#            - name: Set Pypi token
+#              run: poetry config pypi-token.test-pypi ${{ secrets.PYPI_TOKEN }}
+#            - name: Publish new release to Pypi repository
+#              run: poetry publish -r test-pypi
+
             - name: Commit the pre-release changes
               uses: stefanzweifel/git-auto-commit-action@v4
               with:
+                file_pattern: 'docs pyproject.toml'
                 commit_message: "New release: ${{ github.event.inputs.new_version }}"
             - name: Create Github release
               uses: ncipollo/release-action@v1
               with:
                   tag: "v${{ github.event.inputs.new_version }}"
+
             - name: Update SDK version in the Docker image
-              run: sed -i "s/\(.*codeflare-sdk==\)[^\\s]*\(.*\)/\${{ github.event.inputs.new_version }}\2/" custom-nb-image/Dockerfile
-            - name: Update Docker image version
-              run: echo ${{ github.event.inputs.new_version }} > custom-nb-image/VERSION
-            - name: Commit new version of the Docker image
-              uses: stefanzweifel/git-auto-commit-action@v4
+              run: sed -i "s/\(.*codeflare-sdk==\)[^\\s]*\(.*\)/\1${{ github.event.inputs.new_version }}\2/" custom-nb-image/Dockerfile
+            - name: Image Build
+              run: |
+                cd custom-nb-image
+                docker build -t quay.io/jpetrlik/notebook:${{ github.event.inputs.image_tag }} .
+                docker tag quay.io/jpetrlik/notebook:${{ github.event.inputs.image_tag }} quay.io/jpetrlik/notebook:latest
+            - name: Login to Quay.io
+              uses: docker/login-action@v2
               with:
-                commit_message: "New image tag: ${{ github.event.inputs.image_tag }}"
+                registry: quay.io
+                username: ${{ secrets.QUAY_ID }}
+                password: ${{ secrets.QUAY_TOKEN }}
+            - name: Image Push
+              run: |
+                docker push quay.io/jpetrlik/notebook:${{ github.event.inputs.image_tag }}
+                docker push quay.io/jpetrlik/notebook:latest

.github/workflows/release.yaml

@@ -65,8 +65,7 @@ The following instructions apply when doing release manually.
 * Check and update the version in "custom-nb-image/VERSION" file.
 * Update the codeflare-sdk version in "custom-nb-image/Dockerfile".
 * Commit all the changes to the repository.
-* The Github "Image" workflow should take care about the building and publishing of the new image. If not you can
-use the following instructions to build and publish image manually.
+* Use the following instructions to build and publish image manually.
 * Change directory to custom-nb-image. `cd custom-nb-image`
 * Get tag `export tag=$(cat VERSION)`
 * Build the Docker image. `docker build -t quay.io/project-codeflare/notebook:${tag} .`