-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,24 +32,24 @@ runs: | |
sudo sh -c "wget -O - https://dl.openfoam.org/gpg.key > /etc/apt/trusted.gpg.d/openfoam.asc" | ||
sudo add-apt-repository http://dl.openfoam.org/ubuntu | ||
sudo apt update | ||
echo "apt-package=openfoam${{ inputs.openfoam-version }}" >> $GITHUB_OUTPUT | ||
echo "apt-packages=openfoam${{ inputs.openfoam-version }}" >> $GITHUB_OUTPUT | ||
echo "openfoam-bashrc=/opt/openfoam${{ inputs.openfoam-version }}/etc/bashrc" >> "$GITHUB_OUTPUT" | ||
else | ||
export DEBIAN_FRONTEND=noninteractive | ||
sudo apt-get install -y curl || sudo apt update && sudo apt-get install -y curl | ||
curl -s https://dl.openfoam.com/add-debian-repo.sh | sudo bash | ||
echo "apt-package=openfoam${{ inputs.openfoam-version }}-default" >> "$GITHUB_OUTPUT" | ||
echo "apt-packages=openfoam-default${{ inputs.openfoam-version }} openfoam-selector openfoam${{ inputs.openfoam-version }} openfoam${{ inputs.openfoam-version }}-common openfoam${{ inputs.openfoam-version }}-dev openfoam${{ inputs.openfoam-version }}-source openfoam${{ inputs.openfoam-version }}-tools openfoam${{ inputs.openfoam-version }}-dev openfoam${{ inputs.openfoam-version }}-source openfoam${{ inputs.openfoam-version }}-tutorials" >> $GITHUB_OUTPUT | ||
echo "openfoam-bashrc=/usr/lib/openfoam/openfoam${{ inputs.openfoam-version }}/etc/bashrc" >> "$GITHUB_OUTPUT" | ||
echo "openfoam-shell=/usr/lib/openfoam/openfoam${{ inputs.openfoam-version }}/etc/openfoam" >> "$GITHUB_OUTPUT" | ||
fi | ||
shell: bash | ||
- name: Install OpenFOAM on Linux (with caching) | ||
if: steps.prep.outputs.apt-package && inputs.cache && !job.container | ||
if: steps.prep.outputs.apt-packages && inputs.cache && !job.container | ||
uses: eth-pkg/[email protected] | ||
with: | ||
packages: ${{ steps.prep.outputs.apt-package }} | ||
packages: ${{ steps.prep.outputs.apt-packages }} | ||
- name: Install OpenFOAM on Linux (without caching) | ||
if: steps.prep.outputs.apt-package && (!inputs.cache || job.container) | ||
if: steps.prep.outputs.apt-packages && (!inputs.cache || job.container) | ||
run: | | ||
sudo() { | ||
if [ $(id -u) -eq 0 ]; then | ||
|
@@ -59,7 +59,7 @@ runs: | |
fi | ||
} | ||
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ${{ steps.prep.outputs.apt-package }} | ||
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ${{ steps.prep.outputs.apt-packages }} | ||
shell: bash | ||
- name: Get OS version | ||
if: runner.os == 'macOS' && inputs.cache | ||
|