Skip to content

Commit

Permalink
Merge pull request #1067 from topology-tool-kit/dev
Browse files Browse the repository at this point in the history
Merging dev into stable (1.3.0 release)
  • Loading branch information
julien-tierny authored Sep 23, 2024
2 parents 84d07d0 + 12c6f7d commit 816b7c9
Show file tree
Hide file tree
Showing 513 changed files with 129,036 additions and 69,636 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:
cancel-in-progress: true

env:
PV_TAG: v5.11.1-headless
PV_TAG: v5.13.0-headless
PV_REPO: topology-tool-kit/ttk-paraview


Expand All @@ -35,7 +35,7 @@ jobs:
check-formatting:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install latest clang-format
run: |
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
CMAKE_EXPORT_COMPILE_COMMANDS: ON

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

- name: Install Ubuntu dependencies
run: |
Expand All @@ -113,6 +113,7 @@ jobs:
graphviz \
python3-sklearn \
zlib1g-dev \
libqhull-dev \
doxygen \
clang-tidy
Expand Down Expand Up @@ -160,6 +161,7 @@ jobs:
- name: Check Doxygen documentation warnings
if: matrix.config.dox
continue-on-error: true
run: |
cd build
! cmake --build . --target doc |& grep warning
Expand All @@ -181,7 +183,7 @@ jobs:
CMAKE_EXPORT_COMPILE_COMMANDS: ON

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

- name: Install Ubuntu dependencies
run: |
Expand All @@ -197,6 +199,7 @@ jobs:
graphviz \
python3-sklearn \
zlib1g-dev \
libqhull-dev \
clang-tools \
libomp-dev
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,29 @@ on:
jobs:
docker:
runs-on: ubuntu-20.04
strategy:
matrix:
arch: [linux/amd64, linux/arm64]
timeout-minutes: 3600
steps:
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
-
name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push ttk
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
platforms: linux/amd64,linux/arm64
platforms: ${{ matrix.arch }}
context: "{{defaultContext}}:scripts/docker"
target: ttk
push: true
Expand All @@ -44,9 +47,9 @@ jobs:
cache-to: type=gha,ref=ghcr.io/topology-tool-kit/ttk:buildcache,mode=max
-
name: Build and push ttk-dev
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
platforms: linux/amd64,linux/arm64
platforms: ${{ matrix.arch }}
context: "{{defaultContext}}:scripts/docker"
target: ttk-dev
push: true
Expand Down
Loading

0 comments on commit 816b7c9

Please sign in to comment.