Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding safe folder to allow CI to compile DAGMC #816

Merged
merged 16 commits into from Aug 18, 2022
Merged

Adding safe folder to allow CI to compile DAGMC #816

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
075967d
Update .gitmodules
shimwell Jul 11, 2022
033d1d3
updated checkout action to v3
shimwell Jul 11, 2022
1c06011
added dagmc as safe dir
shimwell Jul 11, 2022
9f5380d
added abs path dagmc as safe dir
shimwell Jul 11, 2022
fb93266
added safe directory for dag install
shimwell Jul 11, 2022
d9a2be1
added entry for safe dir PR
shimwell Jul 11, 2022
42bc8fa
Suggestions from PR review by @gonuke
shimwell Jul 13, 2022
412f140
replaced checkout safe dir with git config
shimwell Jul 14, 2022
e157c92
added /github/home as safe dir
shimwell Jul 15, 2022
1b80301
added more folders to safe dir
shimwell Jul 15, 2022
058b1de
Merge branch 'develop' into fixing_docker_publish_ci-2
shimwell Jul 18, 2022
751ab79
changed from 5.3.0 to 5.3.1 moab
shimwell Jul 21, 2022
2120253
updated to latest 5.4.0 moab
shimwell Jul 25, 2022
880fc4e
update PYTHONPATH
bam241 Aug 1, 2022
90e277f
Merge pull request #3 from bam241/fixing_docker_publish_ci-2
shimwell Aug 2, 2022
71075d7
added pymoab import check
shimwell Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/docker_publish.yml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build and push Dockerfile_1_housekeeping
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build and push Dockerfile_1_external_deps
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build and push Dockerfile_3_moab
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -215,9 +215,11 @@ jobs:
name: Running Housekeeping scrips
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive
set-safe-directory: "/__w/DAGMC/DAGMC"
shimwell marked this conversation as resolved.
Show resolved Hide resolved


- name: Setup
run: |
Expand Down Expand Up @@ -261,9 +263,10 @@ jobs:
name: Installing and Testing DAGMC
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive
set-safe-directory: "/__w/DAGMC/DAGMC"
shimwell marked this conversation as resolved.
Show resolved Hide resolved
shimwell marked this conversation as resolved.
Show resolved Hide resolved

- name: Setup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/housekeeping.yml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ jobs:
image: ghcr.io/svalinn/dagmc-ci-ubuntu-18.04-housekeeping:stable
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup environment
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_build_test.yml
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac_build_test.yml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: macos-10.15

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

- name: Initial setup
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_build_test.yml
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ jobs:
cmake --build . --config Release
cmake --install . --config Release

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: build DAGMC
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
@@ -1,3 +1,3 @@
[submodule "src/pyne/pyne"]
path = src/pyne/pyne
url = https://github.com/pyne/pyne
url = https://github.com/pyne/pyne.git
1 change: 1 addition & 0 deletions doc/CHANGELOG.rst
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ Next version
**Changed:**

* Using multi stage Dockerfile to reduce the number of Dockerfile (#813)
* Adding safe folder to allow CI to compile DAGMC (#814)


v3.2.2
Expand Down