From ec4d27145bce253e76c272c3fd964fc847d14086 Mon Sep 17 00:00:00 2001 From: Gabriel Gerlero Date: Thu, 22 Aug 2024 19:22:52 -0300 Subject: [PATCH] Cache all OpenFOAM apt packages --- action.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/action.yml b/action.yml index 881d37b..8135370 100644 --- a/action.yml +++ b/action.yml @@ -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/apt-deb-cache@v0.2.6 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