From e56b6397729370e09591753fc9301fcb75474c1e Mon Sep 17 00:00:00 2001 From: Pankaj Koti Date: Wed, 18 Sep 2024 19:54:04 +0530 Subject: [PATCH 1/4] Upgrade actions/upload-artifact & actions/download-artifact to v4 --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 846872bff..278265715 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -93,7 +93,7 @@ jobs: hatch run tests.py${{ matrix.python-version }}-${{ matrix.airflow-version }}:test-cov - name: Upload coverage to Github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage-unit-test-${{ matrix.python-version }}-${{ matrix.airflow-version }} path: .coverage @@ -177,7 +177,7 @@ jobs: POSTGRES_PORT: 5432 - name: Upload coverage to Github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage-integration-test-${{ matrix.python-version }}-${{ matrix.airflow-version }} path: .coverage @@ -248,7 +248,7 @@ jobs: POSTGRES_PORT: 5432 - name: Upload coverage to Github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage-integration-expensive-test-${{ matrix.python-version }}-${{ matrix.airflow-version }} path: .coverage @@ -315,7 +315,7 @@ jobs: POSTGRES_PORT: 5432 - name: Upload coverage to Github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage-integration-sqlite-test-${{ matrix.python-version }}-${{ matrix.airflow-version }} path: .coverage @@ -391,7 +391,7 @@ jobs: POSTGRES_PORT: 5432 - name: Upload coverage to Github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage-integration-dbt-1-5-4-test-${{ matrix.python-version }}-${{ matrix.airflow-version }} path: .coverage @@ -534,7 +534,7 @@ jobs: POSTGRES_PORT: 5432 - name: Upload coverage to Github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage-integration-kubernetes-test-${{ matrix.python-version }}-${{ matrix.airflow-version }} path: .coverage @@ -559,7 +559,7 @@ jobs: run: | pip3 install coverage - name: Download all coverage artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: ./coverage - name: Combine coverage From ad60ec929a32100a347afaeb922883e6f40b9177 Mon Sep 17 00:00:00 2001 From: Pankaj Koti Date: Wed, 18 Sep 2024 20:12:51 +0530 Subject: [PATCH 2/4] Run tests on current branch --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 278265715..5ade01750 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: test on: push: # Run on pushes to the default branch - branches: [main] + branches: [main,upgrade-gh-action-artifact-upload-download] pull_request_target: # Also run on pull requests originated from forks branches: [main] From d7aec717d49074c7ac795b4b8339d9209c246f80 Mon Sep 17 00:00:00 2001 From: Pankaj Koti Date: Wed, 18 Sep 2024 20:15:25 +0530 Subject: [PATCH 3/4] Set min version for packaging to 22.0 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2087b3f32..bb9642b04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "importlib-metadata; python_version < '3.8'", "Jinja2>=3.0.0", "msgpack", - "packaging", + "packaging>=22.0", "pydantic>=1.10.0", "typing-extensions; python_version < '3.8'", "virtualenv", @@ -86,7 +86,7 @@ docs = [ "apache-airflow-providers-cncf-kubernetes>=5.1.1", ] tests = [ - "packaging", + "packaging>=22.0", "pytest>=6.0", "pytest-split", "pytest-dotenv", From 6cce0de062944be921826defb6e1f97a79a0fbec Mon Sep 17 00:00:00 2001 From: Tatiana Al-Chueyr Date: Wed, 18 Sep 2024 16:15:35 +0100 Subject: [PATCH 4/4] Update .github/workflows/test.yml Co-authored-by: Pankaj Koti --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ade01750..278265715 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: test on: push: # Run on pushes to the default branch - branches: [main,upgrade-gh-action-artifact-upload-download] + branches: [main] pull_request_target: # Also run on pull requests originated from forks branches: [main]