From 48922f33c1703ce3fd7a7e24bfb92d53aa619bfd Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 12 Feb 2024 11:39:30 -0800 Subject: [PATCH 1/5] Update actions versions in builds.yml --- .github/workflows/builds.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 79341eb6..632dc453 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -83,14 +83,14 @@ jobs: - name: cache hypre if: matrix.mpi == 'par' id: hypre-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.HYPRE_TOP_DIR }} key: ${{ runner.os }}-build-${{ env.HYPRE_TOP_DIR }}-v2.2 - name: build hypre if: steps.hypre-cache.outputs.cache-hit != 'true' && matrix.mpi == 'par' - uses: mfem/github-actions/build-hypre@v2.2 + uses: mfem/github-actions/build-hypre@v2.4 with: archive: ${{ env.HYPRE_ARCHIVE }} dir: ${{ env.HYPRE_TOP_DIR }} @@ -101,14 +101,14 @@ jobs: - name: cache metis if: matrix.mpi == 'par' id: metis-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.METIS_TOP_DIR }} key: ${{ runner.os }}-build-${{ env.METIS_TOP_DIR }}-v2.2 - name: build metis if: steps.metis-cache.outputs.cache-hit != 'true' && matrix.mpi == 'par' - uses: mfem/github-actions/build-metis@v2.2 + uses: mfem/github-actions/build-metis@v2.4 with: archive: ${{ env.METIS_ARCHIVE }} dir: ${{ env.METIS_TOP_DIR }} @@ -131,7 +131,7 @@ jobs: # Install will only run on cache miss. - name: cache mfem id: cache-mfem - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.MFEM_TOP_DIR }} key: ${{ runner.os }}-build-${{ env.MFEM_TOP_DIR }}-${{ env.MFEM_COMMIT }}-${{ matrix.target }}-${{ matrix.build-system}}-v2.4 @@ -177,7 +177,7 @@ jobs: - name: cache deps (Windows) id: cache-deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: vcpkg_cache key: ${{ runner.os }}-vcpkg-v1 @@ -188,7 +188,7 @@ jobs: mkdir -p vcpkg_cache - name: checkout GLVis - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: glvis submodules: recursive @@ -222,7 +222,7 @@ jobs: - name: setup Python if: matrix.build-system == 'cmake' - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -258,7 +258,7 @@ jobs: - name: upload test screenshots if: always() && matrix.build-system == 'cmake' && matrix.os != 'windows-latest' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: test-screenshots-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.mpi }} path: glvis/build/test_screenshots.tar.gz From 287ab8e7da484810b22008d55c4c8eaab0871da1 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 12 Feb 2024 11:44:31 -0800 Subject: [PATCH 2/5] Update actions versions in release.yml --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1bb178d0..1eb3f889 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,14 +67,14 @@ jobs: - name: cache hypre if: matrix.mpi == 'par' id: hypre-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.HYPRE_TOP_DIR }} key: ${{ runner.os }}-build-${{ env.HYPRE_TOP_DIR }}-v2.2 - name: build hypre if: steps.hypre-cache.outputs.cache-hit != 'true' && matrix.mpi == 'par' - uses: mfem/github-actions/build-hypre@v2.2 + uses: mfem/github-actions/build-hypre@v2.4 with: archive: ${{ env.HYPRE_ARCHIVE }} dir: ${{ env.HYPRE_TOP_DIR }} @@ -85,14 +85,14 @@ jobs: - name: cache metis if: matrix.mpi == 'par' id: metis-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.METIS_TOP_DIR }} key: ${{ runner.os }}-build-${{ env.METIS_TOP_DIR }}-v2.2 - name: build metis if: steps.metis-cache.outputs.cache-hit != 'true' && matrix.mpi == 'par' - uses: mfem/github-actions/build-metis@v2.2 + uses: mfem/github-actions/build-metis@v2.4 with: archive: ${{ env.METIS_ARCHIVE }} dir: ${{ env.METIS_TOP_DIR }} @@ -115,7 +115,7 @@ jobs: # Install will only run on cache miss. - name: cache mfem id: cache-mfem - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.MFEM_TOP_DIR }} key: ${{ runner.os }}-build-${{ env.MFEM_TOP_DIR }}-${{ env.MFEM_COMMIT }}-${{ matrix.target }}-${{ matrix.build-system}}-v2.2 @@ -127,7 +127,7 @@ jobs: # superfluous. - name: build mfem if: steps.cache-mfem.outputs.cache-hit != 'true' - uses: mfem/github-actions/build-mfem@v2.2 + uses: mfem/github-actions/build-mfem@v2.4 with: os: ${{ matrix.os }} target: ${{ matrix.target }} @@ -160,7 +160,7 @@ jobs: - name: cache deps (Windows) id: cache-deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: vcpkg_cache key: ${{ runner.os }}-vcpkg-v1 @@ -171,7 +171,7 @@ jobs: mkdir -p vcpkg_cache - name: checkout GLVis - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: glvis submodules: recursive @@ -227,7 +227,7 @@ jobs: cp GLVis.dmg ${GLVIS_EXPORT_NAME} - name: upload binary - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64 path: glvis/build/glvis-${{ github.ref_name }}-${{ runner.os }}-amd64 From fc08dbac2f9c9460ddf441a838c1fd7c105e985f Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 12 Feb 2024 13:21:38 -0800 Subject: [PATCH 3/5] Disable the setup-homebrew action in builds.yml --- .github/workflows/builds.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 632dc453..faa48a8d 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -165,9 +165,9 @@ jobs: sudo apt-get update sudo apt-get install libfontconfig1-dev libfreetype6-dev libsdl2-dev libglew-dev libglm-dev libpng-dev - - name: Set up Homebrew - if: matrix.os == 'macos-latest' - uses: Homebrew/actions/setup-homebrew@master + # - name: Set up Homebrew + # if: matrix.os == 'macos-latest' + # uses: Homebrew/actions/setup-homebrew@master - name: get deps (MacOS) if: matrix.os == 'macos-latest' From d40e653e0a9c5f74cf4419771812dbcb1eb67764 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 12 Feb 2024 13:24:47 -0800 Subject: [PATCH 4/5] Disable the setup-homebrew action in release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1eb3f889..f430b345 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,9 +148,9 @@ jobs: sudo apt-get update sudo apt-get install libfontconfig1-dev libfreetype6-dev libsdl2-dev libglew-dev libglm-dev libpng-dev - - name: Set up Homebrew - if: matrix.os == 'macos-latest' - uses: Homebrew/actions/setup-homebrew@master + # - name: Set up Homebrew + # if: matrix.os == 'macos-latest' + # uses: Homebrew/actions/setup-homebrew@master - name: get deps (MacOS) if: matrix.os == 'macos-latest' From 71a8d1a3b5ee59f3f1cc68e10b2b7a1257272ffd Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 12 Feb 2024 13:50:56 -0800 Subject: [PATCH 5/5] Update the submodule tests/data (https://github.com/GLVis/data) to the latest version. --- tests/data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data b/tests/data index 53fbee22..81de802a 160000 --- a/tests/data +++ b/tests/data @@ -1 +1 @@ -Subproject commit 53fbee222cceb0581122cb72518bfc1b85766b4e +Subproject commit 81de802ad63ba41cd1fcd3825fbb3d2471538ace