From ba25754eaac7b5064e5ed7e6d69d54f0c290c043 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:24:02 +0200 Subject: [PATCH 01/19] fix ci --- .github/workflows/cd.yaml | 41 ++++++++++++++++++++++----------------- pyproject.toml | 2 +- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 990da5b7..285c57f8 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -2,6 +2,8 @@ name: CD on: + pull_request: + branches: push: branches: - main @@ -29,23 +31,26 @@ jobs: git config user.email "action@github.com" git config user.name "GitHub Action" - name: Bumping version + uses: actions/checkout@v3 run: | nox -s bump -- micro - git push origin main - - name: Build artifacts - run: | - nox -s build - - name: Test Build - run: | - python -m pip install dist/*.whl - eva --version - - name: Deploy Documentation - run: | - git fetch origin gh-pages:gh-pages - nox -s docs -- deploy --update-aliases main - git push origin gh-pages - - name: Publish package distributions to PyPI - run: nox -s publish -- --no-build - env: - PDM_PUBLISH_USERNAME: ${{ secrets.PYPI_USERNAME }} - PDM_PUBLISH_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + git add . + git commit -m "Bumping minor version" + git push origin ioannis@dev + # - name: Build artifacts + # run: | + # nox -s build + # - name: Test Build + # run: | + # python -m pip install dist/*.whl + # eva --version + # - name: Deploy Documentation + # run: | + # git fetch origin gh-pages:gh-pages + # nox -s docs -- deploy --update-aliases main + # git push origin gh-pages + # - name: Publish package distributions to PyPI + # run: nox -s publish -- --no-build + # env: + # PDM_PUBLISH_USERNAME: ${{ secrets.PYPI_USERNAME }} + # PDM_PUBLISH_PASSWORD: ${{ secrets.PYPI_PASSWORD }} diff --git a/pyproject.toml b/pyproject.toml index b1fc27a1..b8965116 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "pdm.backend" [project] name = "kaiko-eva" -version = "0.1.0" +version = "0.1.1" description = "Evaluation Framework for oncology foundation models." keywords = [ "machine-learning", From 9c11fd20de01aa1a97dfe9354322c5c729b88405 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:25:59 +0200 Subject: [PATCH 02/19] fix ci --- .github/workflows/cd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 285c57f8..84916fa4 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -4,9 +4,9 @@ name: CD on: pull_request: branches: - push: - branches: - - main + # push: + # branches: + # - main permissions: id-token: write From 4c0d82688e1f133f247457b5521145d7890405db Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:27:41 +0200 Subject: [PATCH 03/19] fix ci --- .github/workflows/cd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 84916fa4..a1cb88ed 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -31,7 +31,6 @@ jobs: git config user.email "action@github.com" git config user.name "GitHub Action" - name: Bumping version - uses: actions/checkout@v3 run: | nox -s bump -- micro git add . From fc4771744b3bb9b618b424e0adef5d47a793c751 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:29:03 +0200 Subject: [PATCH 04/19] fix ci --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index a1cb88ed..8ac319fc 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -35,7 +35,7 @@ jobs: nox -s bump -- micro git add . git commit -m "Bumping minor version" - git push origin ioannis@dev + git push origin main # - name: Build artifacts # run: | # nox -s build From c63da44ba6b972c94b927b3a8a5652f7d83850e7 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:32:17 +0200 Subject: [PATCH 05/19] fix ci --- .github/workflows/cd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 8ac319fc..721d0424 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -34,8 +34,8 @@ jobs: run: | nox -s bump -- micro git add . - git commit -m "Bumping minor version" - git push origin main + git commit -am "Bumping minor version" + git push -u origin ioannis@dev # - name: Build artifacts # run: | # nox -s build From 09d788b7a00bcabbafeb0a3d07c6e3658edc6d3a Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:34:06 +0200 Subject: [PATCH 06/19] fix ci --- .github/workflows/cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 721d0424..5ba30923 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -33,6 +33,7 @@ jobs: - name: Bumping version run: | nox -s bump -- micro + git init git add . git commit -am "Bumping minor version" git push -u origin ioannis@dev From c1d54607b8a7402d71067399f8aa0a4e07876289 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:35:27 +0200 Subject: [PATCH 07/19] fix ci --- .github/workflows/cd.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 5ba30923..be6909f8 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -33,10 +33,9 @@ jobs: - name: Bumping version run: | nox -s bump -- micro - git init git add . git commit -am "Bumping minor version" - git push -u origin ioannis@dev + git push -u origin main # - name: Build artifacts # run: | # nox -s build From fa5d66b418da0be8d713f0c76136015064481613 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:35:58 +0200 Subject: [PATCH 08/19] fix ci --- .github/workflows/cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index be6909f8..15c09393 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -32,6 +32,7 @@ jobs: git config user.name "GitHub Action" - name: Bumping version run: | + git fetch origin main:main nox -s bump -- micro git add . git commit -am "Bumping minor version" From 43374c2752bc89592b763528e23c5cd23a57c584 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:38:35 +0200 Subject: [PATCH 09/19] fix ci --- .github/workflows/cd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 15c09393..b7423fc9 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -34,8 +34,8 @@ jobs: run: | git fetch origin main:main nox -s bump -- micro - git add . - git commit -am "Bumping minor version" + git add pyproject.toml + git commit -m "Bumping minor version" git push -u origin main # - name: Build artifacts # run: | From a087b15df4b81a8bd4fd61d6025062d6fb033f72 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 11:41:31 +0200 Subject: [PATCH 10/19] fix ci --- .github/workflows/cd.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index b7423fc9..f78c9618 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -34,8 +34,7 @@ jobs: run: | git fetch origin main:main nox -s bump -- micro - git add pyproject.toml - git commit -m "Bumping minor version" + git commit -a -m "Bumping minor version" git push -u origin main # - name: Build artifacts # run: | From 942a46814cbc333e01f6db26c044a663abf4561c Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:10:32 +0200 Subject: [PATCH 11/19] fix ci --- .github/workflows/cd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index f78c9618..3c21e42a 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -32,10 +32,10 @@ jobs: git config user.name "GitHub Action" - name: Bumping version run: | - git fetch origin main:main + git fetch origin nox -s bump -- micro - git commit -a -m "Bumping minor version" - git push -u origin main + git commit -am "Bumping minor version" + git push origin main # - name: Build artifacts # run: | # nox -s build From 52f0c190ff5330e85327415efdb621c3422d1543 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:13:40 +0200 Subject: [PATCH 12/19] fix ci --- .github/workflows/cd.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 3c21e42a..5f8e0023 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -32,10 +32,11 @@ jobs: git config user.name "GitHub Action" - name: Bumping version run: | - git fetch origin + git remote add origin https://github.com/kaiko-ai/eva nox -s bump -- micro git commit -am "Bumping minor version" git push origin main + # git fetch origin # - name: Build artifacts # run: | # nox -s build From 50c67c05004c8916c36ac5b13d792f3a0ddc20d7 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:14:44 +0200 Subject: [PATCH 13/19] fix ci --- .github/workflows/cd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 5f8e0023..e6eed209 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -32,7 +32,6 @@ jobs: git config user.name "GitHub Action" - name: Bumping version run: | - git remote add origin https://github.com/kaiko-ai/eva nox -s bump -- micro git commit -am "Bumping minor version" git push origin main From a5f6aa4c2d70c44136f2c0aa92019842e63c4bd9 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:16:05 +0200 Subject: [PATCH 14/19] fix ci --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index e6eed209..b12f2011 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -34,7 +34,7 @@ jobs: run: | nox -s bump -- micro git commit -am "Bumping minor version" - git push origin main + git push # git fetch origin # - name: Build artifacts # run: | From 99a2bd2777545db0f8ebbb349726674102baa7d1 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:17:12 +0200 Subject: [PATCH 15/19] fix ci --- .github/workflows/cd.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index b12f2011..02e5c317 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -32,9 +32,10 @@ jobs: git config user.name "GitHub Action" - name: Bumping version run: | + git fetch origin main nox -s bump -- micro git commit -am "Bumping minor version" - git push + git push -f origin HEAD:main # git fetch origin # - name: Build artifacts # run: | From 3d399b37c54edf49a7cc944f04b7a2f371c1c054 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:18:54 +0200 Subject: [PATCH 16/19] fix ci --- .github/workflows/cd.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 02e5c317..ffcc7d3d 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -35,7 +35,8 @@ jobs: git fetch origin main nox -s bump -- micro git commit -am "Bumping minor version" - git push -f origin HEAD:main + git push origin HEAD + # git push -f origin HEAD:main # git fetch origin # - name: Build artifacts # run: | From e066a363ea389e31e9543f0efd0fd74606f7dc2b Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 12:20:06 +0200 Subject: [PATCH 17/19] fix ci --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index ffcc7d3d..0ec2b99e 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -35,7 +35,7 @@ jobs: git fetch origin main nox -s bump -- micro git commit -am "Bumping minor version" - git push origin HEAD + git push origin HEAD:main # git push -f origin HEAD:main # git fetch origin # - name: Build artifacts From 4a0882d0619edebb46fc41a9f5165fd278f3106a Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 13:15:12 +0200 Subject: [PATCH 18/19] fix ci --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 0ec2b99e..0c1ac844 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -35,7 +35,7 @@ jobs: git fetch origin main nox -s bump -- micro git commit -am "Bumping minor version" - git push origin HEAD:main + git push -f origin HEAD:main # git push -f origin HEAD:main # git fetch origin # - name: Build artifacts From 4500857a25a1014adb3ba4e5a4e644d5e9543bc1 Mon Sep 17 00:00:00 2001 From: ioangatop Date: Tue, 1 Oct 2024 13:24:49 +0200 Subject: [PATCH 19/19] fix ci --- .github/workflows/cd.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 0c1ac844..34df0bfd 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -16,7 +16,10 @@ jobs: release-pypi: runs-on: ubuntu-latest steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - name: Checkout branch + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + with: + token: ${{ secrets.GH_PAT }} - name: Setting up PDM uses: pdm-project/setup-pdm@568ddd69406b30de1774ec0044b73ae06e716aa4 # v4 with: @@ -34,7 +37,8 @@ jobs: run: | git fetch origin main nox -s bump -- micro - git commit -am "Bumping minor version" + git add pyproject.toml + git commit -m "Bumping minor version" git push -f origin HEAD:main # git push -f origin HEAD:main # git fetch origin