From 616622aa399693e13f80bf71208ea3934aede314 Mon Sep 17 00:00:00 2001 From: Maciej Urbanski Date: Fri, 13 Sep 2024 00:24:43 +0200 Subject: [PATCH 1/2] ensure get_versions() in noxfile doesn't hallucinate old b2 binary names due to git not deleting folders --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 2409c0a3..654cdcba 100644 --- a/noxfile.py +++ b/noxfile.py @@ -128,7 +128,7 @@ def get_versions() -> list[str]: path.name for path in sorted( (pathlib.Path(__file__).parent / 'b2' / '_internal').glob('*b2v*'), key=get_version_key, - ) + ) if (path / '__init__.py').exists() ] From 2f942e040897bd693cf23e05d32886ef4cd4edbe Mon Sep 17 00:00:00 2001 From: Maciej Urbanski Date: Fri, 13 Sep 2024 13:37:00 +0200 Subject: [PATCH 2/2] update actions/upload-artifact (v2 got deprecated) --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aad31072..6fb13b67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,11 +195,12 @@ jobs: run: nox -vs integration -p ${{ env.PYTHON_DEFAULT_VERSION }} -- --sut=${{ steps.bundle.outputs.sut_path }} -m "require_secrets" --cleanup - name: Upload assets if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: ${{ steps.bundle.outputs.asset_path }} if-no-files-found: warn retention-days: 7 + overwrite: true test-windows-bundle: timeout-minutes: 90 needs: cleanup_buckets @@ -235,11 +236,12 @@ jobs: run: nox -vs integration -p ${{ env.PYTHON_DEFAULT_VERSION }} -- --sut=${{ steps.bundle.outputs.sut_path }} -m "require_secrets" --cleanup - name: Upload assets if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: ${{ steps.bundle.outputs.asset_path }} if-no-files-found: warn retention-days: 7 + overwrite: true doc: timeout-minutes: 30 needs: build