diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index cd43adbbe..0dbb6e269 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -9,7 +9,7 @@ jobs: runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 909bf2cca..5a9d9ce76 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -8,6 +8,10 @@ on: tags: "*" pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + jobs: build-test-cmake: name: CMake @@ -20,14 +24,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: # required for `git describe --tags` to work fetch-depth: 0 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.11' @@ -70,7 +74,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: # required for `git describe --tags` to work fetch-depth: 0 @@ -83,16 +87,16 @@ jobs: if: matrix.os == 'ubuntu-latest' - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - - name: Build macOS/Windows Wheel + - name: Build macOS Wheel + if: runner.os == 'macOS' run: pip wheel . --no-deps -w dist - if: matrix.os != 'ubuntu-latest' - name: Upload wheel as artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.os }} Python ${{ matrix.python }} wheel path: dist/* @@ -135,7 +139,7 @@ jobs: steps: - name: Get wheels - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: artifacts diff --git a/.gitignore b/.gitignore index 596585bf1..7be6fd8ae 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ scratch.sparsebundle /venv/ /_skbuild/ /python/resdata/version.py -.* *.egg-info/ /dist