Skip to content

Commit 096d105

Browse files
marco-de-pietrimarco-de-pietri
authored
Merge branch 'openmc-dev:develop' into generalize-get-decay-particle-energy
2 parents fd49915 + fd1bc26 commit 096d105

10 files changed

Lines changed: 26 additions & 17 deletions

‎.github/workflows/dockerhub-publish-dagmc-libmesh.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-latest-dagmc-libmesh
22

33
on:
44
push:
5-
branches: master
5+
branches:
6+
- master
67

78
jobs:
89
main:

‎.github/workflows/dockerhub-publish-dagmc.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-latest-dagmc
22

33
on:
44
push:
5-
branches: master
5+
branches:
6+
- master
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/dockerhub-publish-dev.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-develop
22

33
on:
44
push:
5-
branches: develop
5+
branches:
6+
- develop
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/dockerhub-publish-develop-dagmc-libmesh.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-develop-dagmc-libmesh
22

33
on:
44
push:
5-
branches: develop
5+
branches:
6+
- develop
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/dockerhub-publish-develop-dagmc.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-develop-dagmc
22

33
on:
44
push:
5-
branches: develop
5+
branches:
6+
- develop
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/dockerhub-publish-develop-libmesh.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-develop-libmesh
22

33
on:
44
push:
5-
branches: develop
5+
branches:
6+
- develop
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/dockerhub-publish-libmesh.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-latest-libmesh
22

33
on:
44
push:
5-
branches: master
5+
branches:
6+
- master
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/dockerhub-publish.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: dockerhub-publish-latest
22

33
on:
44
push:
5-
branches: master
5+
branches:
6+
- master
67

78
jobs:
89
main:
@@ -16,7 +17,7 @@ jobs:
1617
uses: docker/setup-buildx-action@v3
1718
-
1819
name: Login to DockerHub
19-
uses: docker/login-action@v3
20+
uses: docker/login-action@v3
2021
with:
2122
username: ${{ secrets.DOCKERHUB_USERNAME }}
2223
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ENV LIBMESH_REPO='https://github.com/libMesh/libmesh'
5353
ENV LIBMESH_INSTALL_DIR=$HOME/LIBMESH
5454

5555
# NJOY variables
56+
ENV NJOY_TAG='2016.78'
5657
ENV NJOY_REPO='https://github.com/njoy/NJOY2016'
5758

5859
# Setup environment variables for Docker image
@@ -78,7 +79,7 @@ RUN pip install --upgrade pip
7879

7980
# Clone and install NJOY2016
8081
RUN cd $HOME \
81-
&& git clone --single-branch --depth 1 ${NJOY_REPO} \
82+
&& git clone --single-branch -b ${NJOY_TAG} --depth 1 ${NJOY_REPO} \
8283
&& cd NJOY2016 \
8384
&& mkdir build \
8485
&& cd build \

‎tools/ci/gha-install-njoy.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -ex
33
cd $HOME
4-
git clone https://github.com/njoy/NJOY2016
4+
git clone -b 2016.78 https://github.com/njoy/NJOY2016
55
cd NJOY2016
66
mkdir build && cd build
77
cmake -Dstatic=on .. && make 2>/dev/null && sudo make install

0 commit comments

Comments
 (0)