diff --git a/.gitattributes b/.gitattributes index af9964a33..36e7d27cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,15 @@ -poetry.lock linguist-generated=true +# Core Data and Locks +poetry.lock linguist-generated=true exasol/toolbox/version.py linguist-generated=true -doc/changes/changelog.md linguist-generated=true +doc/changes/changelog.md linguist-generated=true .github/actions/python-environment/ext/get_poetry.py linguist-generated=true + +# PTB GitHub Workflows (CI/CD & Publishing) +.github/workflows/build-and-publish.yml linguist-generated=true +.github/workflows/cd.yml linguist-generated=true +.github/workflows/check-release-tag.yml linguist-generated=true +.github/workflows/ci.yml linguist-generated=true +.github/workflows/gh-pages.yml linguist-generated=true +.github/workflows/matrix-*.yml linguist-generated=true +.github/workflows/pr-merge.yml linguist-generated=true +.github/workflows/report.yml linguist-generated=true diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 4c003256e..9ba56f8d6 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/check-release-tag.yml b/.github/workflows/check-release-tag.yml index f03dba1fb..5423c11a4 100644 --- a/.github/workflows/check-release-tag.yml +++ b/.github/workflows/check-release-tag.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3ccc4476f..1d4d89624 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" @@ -37,7 +37,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" @@ -63,7 +63,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" @@ -88,7 +88,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: ${{ matrix.python-versions }} poetry-version: "2.3.0" @@ -124,7 +124,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: ${{ matrix.python-versions }} poetry-version: "2.3.0" @@ -150,7 +150,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: ${{ matrix.python-versions }} poetry-version: "2.3.0" @@ -179,7 +179,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" @@ -201,7 +201,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" @@ -222,7 +222,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" @@ -245,13 +245,11 @@ jobs: - name: Check out Repository id: check-out-repository uses: actions/checkout@v6 - # The PTB has unit tests which require the fetch-depth to be 0. with: fetch-depth: 0 - - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: ${{ matrix.python-versions }} poetry-version: "2.3.0" diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index d45b01066..5616ebd5a 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/matrix-all.yml b/.github/workflows/matrix-all.yml index a9ffbb63f..69a5aa4b4 100644 --- a/.github/workflows/matrix-all.yml +++ b/.github/workflows/matrix-all.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/matrix-exasol.yml b/.github/workflows/matrix-exasol.yml index 2b9d33df2..44b5cfd98 100644 --- a/.github/workflows/matrix-exasol.yml +++ b/.github/workflows/matrix-exasol.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/matrix-python.yml b/.github/workflows/matrix-python.yml index 2a377bca2..328799b6c 100644 --- a/.github/workflows/matrix-python.yml +++ b/.github/workflows/matrix-python.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml index 3a2a2b4ab..7748487f0 100644 --- a/.github/workflows/report.yml +++ b/.github/workflows/report.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: "3.10" poetry-version: "2.3.0" diff --git a/.github/workflows/slow-checks.yml b/.github/workflows/slow-checks.yml index 0ed2e1b98..da6333779 100644 --- a/.github/workflows/slow-checks.yml +++ b/.github/workflows/slow-checks.yml @@ -29,15 +29,14 @@ jobs: - name: Set up Python & Poetry Environment id: set-up-python-and-poetry-environment - uses: exasol/python-toolbox/.github/actions/python-environment@v5 + uses: exasol/python-toolbox/.github/actions/python-environment@v6 with: python-version: ${{ matrix.python-version }} poetry-version: "2.3.0" - name: Run Integration Tests id: run-integration-tests - run: poetry run -- nox -s test:integration -- --coverage --db-version ${{ matrix.exasol-version }} - + run: poetry run -- nox -s test:integration -- --coverage - name: Upload Artifacts id: upload-artifacts uses: actions/upload-artifact@v6 diff --git a/.workflow-patcher.yml b/.workflow-patcher.yml new file mode 100644 index 000000000..19dad4ab2 --- /dev/null +++ b/.workflow-patcher.yml @@ -0,0 +1,23 @@ +workflows: + - name: checks + step_customizations: + - action: REPLACE + job: run-unit-tests + step_id: check-out-repository + content: + # The PTB has unit tests which require the fetch-depth to be 0. + - name: Check out Repository + id: check-out-repository + uses: actions/checkout@v6 + with: + fetch-depth: 0 + - name: slow-checks + step_customizations: + - action: REPLACE + job: run-integration-tests + step_id: run-integration-tests + content: + # The PTB integration tests do not need an Exasol Database + - name: Run Integration Tests + id: run-integration-tests + run: poetry run -- nox -s test:integration -- --coverage diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md index fb4737052..a8f19412f 100644 --- a/doc/changes/unreleased.md +++ b/doc/changes/unreleased.md @@ -1,3 +1,7 @@ # Unreleased ## Summary + +## Refactoring + +* #728: Updated to latest PTB workflows and added `.workflow-patcher.yml`