From 11a3e622e3b85eb73d52bfc6cd4b8aff6d15fd39 Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 20:37:13 -0400 Subject: [PATCH 1/7] check out main? --- .github/workflows/pypi_deployment.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index 5ce143d..249f700 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -89,6 +89,10 @@ jobs: with: python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v4 + with: + ref: 'main' + - name: Install dependencies run: | python -m pip install --upgrade pip From fbf812e134d0859939dfec61e5db65125317c4a7 Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 20:44:05 -0400 Subject: [PATCH 2/7] check out new branch --- .github/workflows/pypi_deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index 249f700..0add5aa 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -91,7 +91,7 @@ jobs: - uses: actions/checkout@v4 with: - ref: 'main' + ref: "dev-${{ github.ref_name.split('v')[1] }}" - name: Install dependencies run: | From 4d6d3173dd061dae8a57dba91777cb72fa6f0e79 Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 20:53:55 -0400 Subject: [PATCH 3/7] one more attempt --- .github/workflows/pypi_deployment.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index 0add5aa..bc1aeb0 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Set Variables if: startsWith(github.ref, 'refs/tags/v') - run: echo "VERSION=\"Version ${{ github.ref_name }}\"" >> $GITHUB_ENV + run: echo "RELEASE_NAME=\"Version ${{ github.ref_name }}\"" >> $GITHUB_ENV - uses: actions/setup-python@v5 with: @@ -61,7 +61,7 @@ jobs: - name: Release artifact uses: softprops/action-gh-release@v1 with: - name: ${{ env.VERSION }} + name: ${{ env.RELEASE_NAME }} files: dist/*.whl @@ -83,7 +83,10 @@ jobs: steps: - name: Set Variables if: startsWith(github.ref, 'refs/tags/v') - run: echo "VERSION=\"Version ${{ github.ref_name }}\"" >> $GITHUB_ENV + run: | + TAG=${{ github.ref_name }} + echo "RELEASE_NAME=\"Version $TAG\"" >> $GITHUB_ENV + echo "VERSION=${TAG#v}" >> $GITHUB_ENV - uses: actions/setup-python@v5 with: @@ -91,7 +94,7 @@ jobs: - uses: actions/checkout@v4 with: - ref: "dev-${{ github.ref_name.split('v')[1] }}" + ref: "dev-$VERSION" - name: Install dependencies run: | @@ -115,5 +118,5 @@ jobs: - name: Release artifact uses: softprops/action-gh-release@v1 with: - name: ${{ env.VERSION }} + name: ${{ env.RELEASE_NAME }} files: dist/*.whl From 76253c74545a38b4da4eb6cad99da3f770c7b34b Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 20:55:51 -0400 Subject: [PATCH 4/7] well --- .github/workflows/pypi_deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index bc1aeb0..e128e95 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -94,7 +94,7 @@ jobs: - uses: actions/checkout@v4 with: - ref: "dev-$VERSION" + ref: "dev-${{ env.VERSION }}" - name: Install dependencies run: | From 6c6f7731f840fa879a7647733a1ae33fa5767ae7 Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 21:05:09 -0400 Subject: [PATCH 5/7] simpler way --- .github/workflows/pypi_deployment.yml | 2 +- scripts/pomdp_py_release.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index e128e95..fbad5f3 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -94,7 +94,7 @@ jobs: - uses: actions/checkout@v4 with: - ref: "dev-${{ env.VERSION }}" + ref: "main" - name: Install dependencies run: | diff --git a/scripts/pomdp_py_release.sh b/scripts/pomdp_py_release.sh index 1d2c4f5..dfc11c1 100755 --- a/scripts/pomdp_py_release.sh +++ b/scripts/pomdp_py_release.sh @@ -87,8 +87,10 @@ fi echo $version if ! is_git_repo_on_branch $pomdp_py_path dev-$version; then if ! is_git_repo_on_branch $pomdp_py_path dev-latest; then - echo "pomdp-py repo must be either on dev-latest or dev-$version, but not $current_branch. Abort" - exit 1 + if ! is_git_repo_on_branch $pomdp_py_path main; then + echo "pomdp-py repo must be either on dev-latest or dev-$version, or main, but not $current_branch. Abort" + exit 1 + fi fi fi From 9caebd5a666947b8a7846f37c2d13e6ecc710b2e Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 21:11:48 -0400 Subject: [PATCH 6/7] revert something --- .github/workflows/pypi_deployment.yml | 2 +- scripts/pomdp_py_release.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index fbad5f3..e128e95 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -94,7 +94,7 @@ jobs: - uses: actions/checkout@v4 with: - ref: "main" + ref: "dev-${{ env.VERSION }}" - name: Install dependencies run: | diff --git a/scripts/pomdp_py_release.sh b/scripts/pomdp_py_release.sh index dfc11c1..1d2c4f5 100755 --- a/scripts/pomdp_py_release.sh +++ b/scripts/pomdp_py_release.sh @@ -87,10 +87,8 @@ fi echo $version if ! is_git_repo_on_branch $pomdp_py_path dev-$version; then if ! is_git_repo_on_branch $pomdp_py_path dev-latest; then - if ! is_git_repo_on_branch $pomdp_py_path main; then - echo "pomdp-py repo must be either on dev-latest or dev-$version, or main, but not $current_branch. Abort" - exit 1 - fi + echo "pomdp-py repo must be either on dev-latest or dev-$version, but not $current_branch. Abort" + exit 1 fi fi From d9921837497575a2bbfb64c1787a19b22e9b2646 Mon Sep 17 00:00:00 2001 From: Kaiyu Zheng Date: Tue, 12 Mar 2024 21:18:00 -0400 Subject: [PATCH 7/7] every possible error --- .github/workflows/pypi_deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi_deployment.yml b/.github/workflows/pypi_deployment.yml index e128e95..4abce5e 100644 --- a/.github/workflows/pypi_deployment.yml +++ b/.github/workflows/pypi_deployment.yml @@ -112,7 +112,7 @@ jobs: # This will upload stuff under dist/ to PyPI user: __token__ password: ${{ secrets.PYPI_TOKEN }} - repository_url: https://pypi.org/ + repository_url: https://upload.pypi.org/legacy/ skip-existing: true - name: Release artifact