From a8477921d5bf6d9b832f2e8c07114c4fbf0e09af Mon Sep 17 00:00:00 2001 From: Bharat Medasani Date: Sat, 10 Feb 2024 14:49:36 -0500 Subject: [PATCH 1/5] Node.js version bump --- .github/workflows/conda.yml | 4 ++-- .github/workflows/docker.yml | 6 +++--- .github/workflows/docs_test.yml | 4 ++-- .github/workflows/extensive_test.yml | 4 ++-- .github/workflows/linting.yml | 4 ++-- .github/workflows/non_simd_tests.yml | 4 ++-- .github/workflows/singularity.yml | 2 +- .github/workflows/tests.yml | 4 ++-- .github/workflows/wheel.yml | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index b178720e0..48926a07f 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -26,7 +26,7 @@ jobs: shell: "bash -l {0}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true @@ -34,7 +34,7 @@ jobs: run: git fetch --prune --unshallow - name: Get conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} channels: conda-forge diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e6c6b38a8..878924726 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -17,16 +17,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Fetch all history for all tags and branches run: git fetch --prune --unshallow - name: Setup docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: medbha password: ${{ secrets.DOCKER_TOKEN }} diff --git a/.github/workflows/docs_test.yml b/.github/workflows/docs_test.yml index 78017b9a7..57b0cfc24 100644 --- a/.github/workflows/docs_test.yml +++ b/.github/workflows/docs_test.yml @@ -12,10 +12,10 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/extensive_test.yml b/.github/workflows/extensive_test.yml index 43183f13f..59aca3077 100644 --- a/.github/workflows/extensive_test.yml +++ b/.github/workflows/extensive_test.yml @@ -63,7 +63,7 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential gfortran openmpi-bin libopenmpi-dev libnetcdf-dev libnetcdff-dev liblapack-dev libscalapack-mpi-dev libhdf5-dev libhdf5-serial-dev git m4 libfftw3-dev libopenblas-dev libboost-all-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # If we want submodules downloaded, uncomment the next 2 lines: #with: # submodules: true @@ -80,7 +80,7 @@ jobs: pwd - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index ccbd8d01f..5eea66ef0 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -12,10 +12,10 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/non_simd_tests.yml b/.github/workflows/non_simd_tests.yml index 946a91db5..f3ae7c6c3 100644 --- a/.github/workflows/non_simd_tests.yml +++ b/.github/workflows/non_simd_tests.yml @@ -54,7 +54,7 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential gfortran openmpi-bin libopenmpi-dev libnetcdf-dev libnetcdff-dev liblapack-dev libscalapack-mpi-dev libhdf5-dev libhdf5-serial-dev git m4 libfftw3-dev libboost-all-dev libopenblas-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Fetch all history for all tags run: git fetch --all --tags --prune --unshallow @@ -66,7 +66,7 @@ jobs: pwd - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/singularity.yml b/.github/workflows/singularity.yml index 1de6b269e..55f686e49 100644 --- a/.github/workflows/singularity.yml +++ b/.github/workflows/singularity.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Check out code for the container build - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: eWaterCycle/setup-singularity@v7 with: singularity-version: 3.8.3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ebff4fa57..2f6900d0b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,7 +59,7 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential gfortran openmpi-bin libopenmpi-dev libnetcdf-dev libnetcdff-dev liblapack-dev libscalapack-mpi-dev libhdf5-dev libhdf5-serial-dev git m4 libfftw3-dev libboost-all-dev libopenblas-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Fetch all history for all tags run: git fetch --all --tags --prune --unshallow @@ -75,7 +75,7 @@ jobs: pwd - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index e925d413e..8044ebfe4 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -11,7 +11,7 @@ jobs: os: [macos-11, ubuntu-20.04] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Fetch all history for all tags run: git fetch --prune --unshallow @@ -37,12 +37,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Fetch all history for all tags run: git fetch --prune --unshallow - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: '3.9' From 29baa9e8e440631bf3d81cec5bcb8bee0e7b11ab Mon Sep 17 00:00:00 2001 From: Matt Landreman Date: Wed, 14 Feb 2024 07:26:28 -0500 Subject: [PATCH 2/5] Updated more versions of actions used in workflows --- .github/workflows/extensive_test.yml | 14 +++++++------- .github/workflows/tests.yml | 8 ++++---- .github/workflows/wheel.yml | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/extensive_test.yml b/.github/workflows/extensive_test.yml index 59aca3077..072bedd67 100644 --- a/.github/workflows/extensive_test.yml +++ b/.github/workflows/extensive_test.yml @@ -68,7 +68,7 @@ jobs: #with: # submodules: true - # We must run actions/checkout@v3 before downloading and building VMEC, since checkout deletes the contents of the directory. + # We must run actions/checkout before downloading and building VMEC, since checkout deletes the contents of the directory. - name: Download the VMEC2000 standalone repository if: contains(matrix.packages, 'vmec') || contains(matrix.packages, 'all') run: git clone https://github.com/hiddensymmetries/VMEC2000.git @@ -112,7 +112,7 @@ jobs: # https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token - name: Check out SPEC if: contains(matrix.packages, 'spec') || contains(matrix.packages, 'all') - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: PrincetonUniversity/SPEC path: SPEC @@ -237,7 +237,7 @@ jobs: - name: Upload uncombined coverage to github if: contains(matrix.test-type, 'unit') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: gh-actions-parallel-coverage path: .coverage.* @@ -249,7 +249,7 @@ jobs: steps: - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -257,13 +257,13 @@ jobs: run: pip install coverage - name: Checkout simsopt - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install simsopt before running coverage run: pip install . - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: gh-actions-parallel-coverage path: ./ @@ -278,7 +278,7 @@ jobs: coverage xml - name: Upload coverage to github - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: tox-gh-actions-coverage path: coverage.xml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2f6900d0b..b9c0ad3d7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -64,7 +64,7 @@ jobs: - name: Fetch all history for all tags run: git fetch --all --tags --prune --unshallow - # We must run actions/checkout@v3 before downloading and building VMEC, since checkout deletes the contents of the directory. + # We must run actions/checkout before downloading and building VMEC, since checkout deletes the contents of the directory. - name: Download the VMEC2000 standalone repository run: git clone --depth=1 https://github.com/hiddensymmetries/VMEC2000.git @@ -105,7 +105,7 @@ jobs: # https://stackoverflow.com/questions/57612428/cloning-private-github-repository-within-organisation-in-actions # https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token - name: Check out SPEC - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: PrincetonUniversity/SPEC path: SPEC @@ -209,7 +209,7 @@ jobs: - name: Upload coverage to github if: contains(matrix.test-type, 'unit') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: tox-gh-actions-coverage path: coverage.xml @@ -218,7 +218,7 @@ jobs: - name: Upload coverage to Codecov # The last conditional on the next line prevents github from trying to upload to Codecov on forks of the repository, avoiding a permissions error if: contains(matrix.test-type, 'unit') && github.repository_owner == 'hiddenSymmetries' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./coverage.xml diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 8044ebfe4..981fa413a 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -28,7 +28,7 @@ jobs: CIBW_SKIP: cp27-* cp36-* cp37-* CIBW_DEPENDENCY_VERSIONS: latest - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl @@ -56,7 +56,7 @@ jobs: - name: Build sdist run: python -m build -s -o dist . - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz @@ -68,7 +68,7 @@ jobs: # alternatively, to publish when a GitHub Release is created, use the following rule: # if: github.event_name == 'release' && github.event.action == 'published' steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist From 67fb89b624e0aba33493d9dd1b362c622df2c5a2 Mon Sep 17 00:00:00 2001 From: Bharat Medasani Date: Thu, 15 Feb 2024 13:00:35 -0500 Subject: [PATCH 3/5] Update extensive_test.yml --- .github/workflows/extensive_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/extensive_test.yml b/.github/workflows/extensive_test.yml index 072bedd67..37b5ddc4b 100644 --- a/.github/workflows/extensive_test.yml +++ b/.github/workflows/extensive_test.yml @@ -237,7 +237,7 @@ jobs: - name: Upload uncombined coverage to github if: contains(matrix.test-type, 'unit') - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: gh-actions-parallel-coverage path: .coverage.* @@ -263,7 +263,7 @@ jobs: run: pip install . - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: gh-actions-parallel-coverage path: ./ @@ -278,7 +278,7 @@ jobs: coverage xml - name: Upload coverage to github - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: tox-gh-actions-coverage path: coverage.xml From 9105404e41ca9e92966db6408c846caed2361c5c Mon Sep 17 00:00:00 2001 From: Bharat Medasani Date: Thu, 15 Feb 2024 13:01:35 -0500 Subject: [PATCH 4/5] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b9c0ad3d7..637981a4c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ # This appears to be a known harmless annoyance: # https://gitlab.alpinelinux.org/alpine/aports/-/issues/11122 -name: Simple CI +name: Tests on: push: @@ -209,7 +209,7 @@ jobs: - name: Upload coverage to github if: contains(matrix.test-type, 'unit') - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: tox-gh-actions-coverage path: coverage.xml From 193b89e0ef7367c44284697cb309d7bf53d3fa51 Mon Sep 17 00:00:00 2001 From: Bharat Medasani Date: Thu, 15 Feb 2024 13:06:02 -0500 Subject: [PATCH 5/5] Update wheel.yml --- .github/workflows/wheel.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 981fa413a..8044ebfe4 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -28,7 +28,7 @@ jobs: CIBW_SKIP: cp27-* cp36-* cp37-* CIBW_DEPENDENCY_VERSIONS: latest - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl @@ -56,7 +56,7 @@ jobs: - name: Build sdist run: python -m build -s -o dist . - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: path: dist/*.tar.gz @@ -68,7 +68,7 @@ jobs: # alternatively, to publish when a GitHub Release is created, use the following rule: # if: github.event_name == 'release' && github.event.action == 'published' steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: artifact path: dist