Skip to content

Commit

Permalink
Update github actions versions and introduce concurrency
Browse files Browse the repository at this point in the history
  • Loading branch information
larsevj committed Jul 23, 2024
1 parent 5f95e31 commit 3bca2d4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: "ubuntu-latest"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dependencies
run: |
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down Expand Up @@ -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
Expand All @@ -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/*
Expand Down Expand Up @@ -135,7 +139,7 @@ jobs:

steps:
- name: Get wheels
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
path: artifacts

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ scratch.sparsebundle
/venv/
/_skbuild/
/python/resdata/version.py
.*
*.egg-info/

/dist
Expand Down

0 comments on commit 3bca2d4

Please sign in to comment.