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

adding 2022.6 version on build workflow #135

Merged
merged 13 commits into from
Aug 18, 2022
Merged

adding 2022.6 version on build workflow #135

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
965a4f6
adding 2022.6 version on build workflow
bam241 Jul 21, 2022
fd4408c
adding the githash
bam241 Jul 21, 2022
b2599cd
fixing version in test
bam241 Jul 21, 2022
b2fbc9d
adding some fix
bam241 Jul 21, 2022
8968bdd
git safe directory
bam241 Jul 21, 2022
3da387c
removing 2022.6 from windows workflow
bam241 Jul 21, 2022
82ac67b
Update .github/workflows/unix_mac.yml
bam241 Jul 21, 2022
5903adc
fixing location of libsz
bam241 Jul 23, 2022
e814bd8
trying to use an LTS
bam241 Jul 23, 2022
3e108ff
Update scripts/unix_share_build.sh
bam241 Jul 25, 2022
b0453eb
resetting windows workflow
bam241 Aug 18, 2022
e39d711
2022.4 instead of 2022.6
bam241 Aug 18, 2022
16bad48
missed the scripts ref to 2022.6
bam241 Aug 18, 2022
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
6 changes: 5 additions & 1 deletion .github/workflows/unix_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
cubit: [2021.4, 2021.5, 2021.11]
cubit: [2021.4, 2021.5, 2021.11, 2022.6]
os: [ubuntu]
os_version: [20.04, 21.04]
include:
Expand Down Expand Up @@ -89,6 +89,10 @@ jobs:
BASE=Coreform-Cubit-2021.11%2B21637_35609873
CUBIT_BASE_NAME=Coreform-Cubit-2021.11
HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
elif [ "${{ matrix.cubit }}" == "2022.6" ]; then
BASE=Coreform-Cubit-2022.6%2B28861_ea342e28
CUBIT_BASE_NAME=Coreform-Cubit-2022.6
HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
fi

SUFFIX=Lin64
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/unix_mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: macos-10.15
bam241 marked this conversation as resolved.
Show resolved Hide resolved
strategy:
matrix:
cubit: [17.1.0, 2021.4, 2021.5, 2021.11]
cubit: [17.1.0, 2021.4, 2021.5, 2021.11, 2022.6]

name: 'Cubit ${{ matrix.cubit }} Build for MacOS of Svalinn Plugin'

Expand Down Expand Up @@ -63,6 +63,10 @@ jobs:
BASE=Coreform-Cubit-2021.11%2B21637_35609873
CUBIT_BASE_NAME=Coreform-Cubit-2021.11
HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
elif [ "${{ matrix.cubit }}" == "2022.6" ]; then
BASE=Coreform-Cubit-2022.6%2B28861_ea342e28
CUBIT_BASE_NAME=Coreform-Cubit-2022.6
HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
fi

SUFFIX=Mac64
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ jobs:
BASE=Coreform-Cubit-2021.5%2B15962_5043ef39
elif [ "${{ matrix.cubit }}" == "2021.11" ]; then
BASE=Coreform-Cubit-2021.11%2B21637_35609873
elif [ "${{ matrix.cubit }}" == "2022.6" ]; then
BASE=Coreform-Cubit-2022.6%2B28861_ea342e28
fi

echo "COREFORM_BASE_URL=${COREFORM_BASE_URL}/Windows/" >> $GITHUB_ENV
Expand Down
3 changes: 2 additions & 1 deletion scripts/unix_share_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ function linux_setup_cubit() {
cd ${FOLDER_PKG}
$SUDO apt-get install -y ./${CUBIT_PKG}

if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] ; then
if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.6" ] ; then
return
fi

Expand All @@ -230,6 +230,7 @@ function linux_setup_cubit() {
function build_plugin(){
cd ${PLUGIN_ABS_PATH}
cd Cubit-plugin
git config --global --add safe.directory /__w/Cubit-plugin/Cubit-plugin
bam241 marked this conversation as resolved.
Show resolved Hide resolved
git submodule update --init
cd ../
mkdir -pv bld
Expand Down