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

Changed the yml files to use the latest docker. #754

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Changed the yml files to use the latest docker. #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/code_cov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
REPO_NAME: 'dafoam'
DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
DOCKER_TAG: 'v4'
DOCKER_TAG: 'latest'
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: docker
on:
push:
branches:
- v4
- main

env:
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
Expand All @@ -17,11 +17,11 @@ jobs:
- name: Build and push
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u dafoam --password-stdin
docker pull dafoam/opt-packages:v4
docker run -i -d -u dafoamuser --name build_v4 dafoam/opt-packages:v4 /bin/bash
docker exec -e COMPILE_DAFOAM_ADF=1 -i build_v4 /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd /home/dafoamuser/dafoam/repos && rm -rf dafoam && git clone https://github.com/mdolab/dafoam && cd dafoam && git checkout v4 && ./Allmake"
docker export build_v4 > build_v4.tar
docker pull dafoam/opt-packages:latest
docker run -i -d -u dafoamuser --name build_latest dafoam/opt-packages:latest /bin/bash
docker exec -e COMPILE_DAFOAM_ADF=1 -i build_latest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd /home/dafoamuser/dafoam/repos && rm -rf dafoam && git clone https://github.com/mdolab/dafoam && cd dafoam && git checkout latest && ./Allmake"
docker export build_latest > build_latest.tar
docker rm -f $(docker ps -a -q)
docker rmi -f dafoam/opt-packages:v4
docker import build_v4.tar dafoam/opt-packages:v4
docker push dafoam/opt-packages:v4
docker rmi -f dafoam/opt-packages:latest
docker import build_latest.tar dafoam/opt-packages:latest
docker push dafoam/opt-packages:latest
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
REPO_NAME: 'dafoam'
DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
DOCKER_TAG: 'v4'
DOCKER_TAG: 'latest'
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'
Expand Down
Loading