From 9244517073a72266557217715d41b554b387e9ea Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Wed, 7 Dec 2022 18:37:43 +0100 Subject: [PATCH 1/7] CI: fixing pypi syntax (#15943) --- .github/workflows/release-pypi.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index 462521f08cf74..3701c93dbdab8 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -11,9 +11,6 @@ defaults: run: shell: bash -env: - PUBLISH: ${{ startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release' }} - jobs: init: runs-on: ubuntu-20.04 @@ -215,8 +212,8 @@ jobs: needs: [build-packages] uses: ./.github/workflows/legacy-checkpoints.yml with: - push_to_s3: ${{ env.PUBLISH }} - create_pr: ${{ env.PUBLISH }} + push_to_s3: ${{ startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release' }} + create_pr: ${{ startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release' }} secrets: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_KEY_ID: ${{ secrets.AWS_SECRET_KEY_ID }} From 3ba885d3196b7b201dcf414ff11193b3019aba8d Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 7 Dec 2022 18:48:26 +0100 Subject: [PATCH 2/7] connect --- .github/workflows/release-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index 3701c93dbdab8..aaf05d791a026 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -181,7 +181,7 @@ jobs: publish-packages: runs-on: ubuntu-20.04 - needs: waiting + needs: [build-packages, waiting] if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release' steps: - uses: actions/checkout@v3 From 4079ee5118e022c755faa7c00047c63ad91a18ea Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 7 Dec 2022 18:56:22 +0100 Subject: [PATCH 3/7] input --- .github/actions/pkg-publish/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/pkg-publish/action.yml b/.github/actions/pkg-publish/action.yml index b9362784ae6c5..4cdc8d6db4c69 100644 --- a/.github/actions/pkg-publish/action.yml +++ b/.github/actions/pkg-publish/action.yml @@ -30,7 +30,7 @@ runs: if: inputs.pypi-test-token != '' with: user: __token__ - password: ${{ secrets.test_pypi_token_lai }} + password: ${{ input.pypi-test-token }} repository_url: https://test.pypi.org/legacy/ packages_dir: pypi/ verbose: true From 3ca08353c59a93cef411a282f199401a3338c318 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 7 Dec 2022 19:02:14 +0100 Subject: [PATCH 4/7] freeze --- .github/workflows/legacy-checkpoints.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/legacy-checkpoints.yml b/.github/workflows/legacy-checkpoints.yml index 0531f2e72c957..b27ec472c8791 100644 --- a/.github/workflows/legacy-checkpoints.yml +++ b/.github/workflows/legacy-checkpoints.yml @@ -72,6 +72,7 @@ jobs: working-directory: ./ env: PACKAGE_NAME: pytorch + FREEZE_REQUIREMENTS: 1 run: | pip install . -f https://download.pytorch.org/whl/cpu/torch_stable.html pip list From 07b1523f4695e6132d8fd4c28cfccf19219839ba Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 7 Dec 2022 19:18:43 +0100 Subject: [PATCH 5/7] -f --- .github/workflows/release-pypi.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index aaf05d791a026..5e500670865de 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -123,7 +123,9 @@ jobs: - name: GIT Push run: | git status - git push + # force push is not very nice + # but so far the push is rejected even with exception for this user + git push -f waiting: # TODO: replace with back signal from build images/ loop checking for a specific branch? From b1c69d271ea23d725e6d259648a7370cd3b0178c Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 7 Dec 2022 19:55:44 +0100 Subject: [PATCH 6/7] typo --- .github/actions/pkg-publish/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/pkg-publish/action.yml b/.github/actions/pkg-publish/action.yml index 4cdc8d6db4c69..beef2d34f7db9 100644 --- a/.github/actions/pkg-publish/action.yml +++ b/.github/actions/pkg-publish/action.yml @@ -30,7 +30,7 @@ runs: if: inputs.pypi-test-token != '' with: user: __token__ - password: ${{ input.pypi-test-token }} + password: ${{ inputs.pypi-test-token }} repository_url: https://test.pypi.org/legacy/ packages_dir: pypi/ verbose: true From 0fa4ffef0c8d0c8c1fdde337ca01e5bce070b498 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 7 Dec 2022 20:00:38 +0100 Subject: [PATCH 7/7] drop -f --- .github/workflows/release-pypi.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index 5e500670865de..aaf05d791a026 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -123,9 +123,7 @@ jobs: - name: GIT Push run: | git status - # force push is not very nice - # but so far the push is rejected even with exception for this user - git push -f + git push waiting: # TODO: replace with back signal from build images/ loop checking for a specific branch?