Skip to content

Commit

Permalink
Merge branch 'main' of github.com:gridap/GridapP4est.jl into vertical…
Browse files Browse the repository at this point in the history
…ly_extruded_forest_of_quadtrees

Conflicts:
  Project.toml
  • Loading branch information
amartinhuertas committed Mar 28, 2024
2 parents 281c4aa + 3dce80c commit 848fcb8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
env:
P4EST_ROOT_DIR: "/opt/p4est/2.2/"
P4EST_ROOT_DIR: "/opt/p4est/2.3.6/"
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -43,10 +43,10 @@ jobs:
- name: Install p4est
if: steps.cache-p4est.outputs.cache-hit != 'true'
run: |
# Install p4est 2.2 from sources
# Install p4est 2.3.6 from sources
CURR_DIR=$(pwd)
PACKAGE=p4est
VERSION=2.2
VERSION=2.3.6
INSTALL_ROOT=/opt
P4EST_INSTALL=$INSTALL_ROOT/$PACKAGE/$VERSION
TAR_FILE=$PACKAGE-$VERSION.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GridapP4est"
uuid = "c2c8e14b-f5fd-423d-9666-1dd9ad120af9"
authors = ["Alberto F. Martin <[email protected]>"]
version = "0.3.5"
version = "0.3.6"

[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Expand All @@ -19,7 +19,7 @@ ArgParse = "1"
FillArrays = "0.8.4, 0.9, 0.10, 0.11, 0.12, 1"
Gridap = "0.17.22"
MPI = "0.20"
P4est_wrapper = "=0.2.1"
P4est_wrapper = "0.2.2"
PartitionedArrays = "0.3.3"
julia = "1.5,1.6,1.7,1.8,1.9"

Expand Down

0 comments on commit 848fcb8

Please sign in to comment.