From ab9e4873076ded0130d50faf835753ef0d6f4da5 Mon Sep 17 00:00:00 2001 From: Gabriel Gerlero Date: Fri, 18 Oct 2024 10:11:39 -0300 Subject: [PATCH] Manually install repositories and keys --- action.yml | 48 ++++++++++++------------------------------------ gpg.key | 30 ++++++++++++++++++++++++++++++ pubkey.gpg | 30 ++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 gpg.key create mode 100644 pubkey.gpg diff --git a/action.yml b/action.yml index 71b8d56..dbc6e38 100644 --- a/action.yml +++ b/action.yml @@ -15,60 +15,36 @@ runs: - name: Prepare id: prep run: | + sudo() { + if [ $(id -u) -eq 0 ]; then + "$@" + else + command sudo "$@" + fi + } + if [ $(uname) == "Darwin" ]; then brew tap gerlero/openfoam echo "openfoam-app-version=$(brew info gerlero/openfoam/openfoam | head -n 1 | awk '{print $3}')" >> "$GITHUB_OUTPUT" echo "openfoam-etc=/Applications/OpenFOAM-v${{ inputs.openfoam-version }}.app/Contents/Resources/etc" >> "$GITHUB_OUTPUT" elif [ ${{ inputs.openfoam-version }} -lt 1000 ]; then - which wget && which add-apt-repository || echo "apt-packages-pre=wget software-properties-common" >> $GITHUB_OUTPUT + sudo apt-key add ${{ github.action_path }}/pubkey.gpg + sudo bash -c "echo \"deb [arch=$(dpkg --print-architecture)] https://dl.openfoam.com/repos/deb $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main\" > /etc/apt/sources.list.d/openfoam.list" echo "apt-packages=openfoam${{ inputs.openfoam-version }}" >> $GITHUB_OUTPUT echo "openfoam-etc=/opt/openfoam${{ inputs.openfoam-version }}/etc" >> "$GITHUB_OUTPUT" else - which wget || echo "apt-packages-pre=wget gnupg" >> $GITHUB_OUTPUT + sudo apt-key add ${{ github.action_path }}/gpg.key + sudo bash -c "echo \"deb [arch=$(dpkg --print-architecture)] https://dl.openfoam.org/repos/deb $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main\" > /etc/apt/sources.list.d/openfoam.list" echo "apt-packages=openfoam${{ inputs.openfoam-version }}-default" >> $GITHUB_OUTPUT echo "openfoam-etc=/usr/lib/openfoam/openfoam${{ inputs.openfoam-version }}/etc" >> "$GITHUB_OUTPUT" fi shell: bash - - name: Install prerequisites - if: steps.prep.outputs.apt-packages-pre - uses: gerlero/apt-install@v1 - with: - packages: ${{ steps.prep.outputs.apt-packages-pre }} - cache: ${{ inputs.cache && inputs.cache != 'false' }} - - name: Add OpenFOAM APT repository (openfoam.org) - if: steps.prep.outputs.apt-packages && inputs.openfoam-version < 1000 - run: | - sudo() { - if [ $(id -u) -eq 0 ]; then - "$@" - else - command sudo "$@" - fi - } - - sudo wget -O /etc/apt/trusted.gpg.d/openfoam.asc https://dl.openfoam.org/gpg.key - sudo add-apt-repository http://dl.openfoam.org/ubuntu - shell: bash - - name: Add OpenFOAM APT repository (openfoam.com) - if: steps.prep.outputs.apt-packages && inputs.openfoam-version >= 1000 - run: | - sudo() { - if [ $(id -u) -eq 0 ]; then - "$@" - else - command sudo "$@" - fi - } - - wget -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash - shell: bash - name: Install OpenFOAM on Linux if: steps.prep.outputs.apt-packages uses: gerlero/apt-install@v1 with: packages: ${{ steps.prep.outputs.apt-packages }} install-recommends: false - update: ${{ inputs.openfoam-version < 1000 }} cache: ${{ inputs.cache && inputs.cache != 'false' }} - name: Restore OpenFOAM on macOS from cache if: runner.os == 'macOS' && inputs.cache && inputs.cache != 'false' diff --git a/gpg.key b/gpg.key new file mode 100644 index 0000000..d4b1af5 --- /dev/null +++ b/gpg.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBFeGXxcBCACpBHAlBk67MVnHtLux0eI/gJuo5eTSLzQd4TYXgLbOXs8aCEH1 +7JKAS24m2KwtcqBwTfW+wb54b0HHzJn81Zpmd7JXt/6oX4wZHTXMED9/P893UHOI +sC5e1O9BzDQ4J1Ot4SMMRElNZyxdcbqGTvp+t67xrBqG1ZoXO4WYfUemNT+I4xrs +xzguKVvL+yWB8hHZ6JpzScC3xQM9JSL7Gzmv6NvXkr+fDw6Ct/aUdB3PjbSlINKC +4sTfQRvokE6nf7SVMqiPTDup+E1DLLfzvUJSxoCGc34wbiuA5ThqE11Y4DiLZaLe +r3V03nbEJY2T1cGExS7njMs3uFiICovfWdmXABEBAAG0KE9wZW5GT0FNIEZvdW5k +YXRpb24gPGFkbWluQG9wZW5mb2FtLm9yZz6JATcEEwEKACEFAleGXxcCGwMFCwkI +BwMFFQoJCAsFFgMCAQACHgECF4AACgkQbA2scosp2BdYdAf+K1+RfWZZSZBwqpPR +MNvV8RkpQ5k7m68NdFRha6cmxCnFJwyw7EJrI0ZXrnz+VstmTvTt05a2ml3MvMdK +WBZs0/dA3LuqYLjGCPCDB5iu5w/sVCXyawZejoe/X3/ODRDgUiJ1LCKQbhwHqNda +yIH7gBYdmy3bzjncm5lYn/Jxw42qAOog/Lnwrru5EIeTyNWrk495KEjTasb9L31I +61G5oEkZsoDk6kPIf93lHBzey60wyc3dU6jQAbnjCB1PvcQP12uv8MK0bO6E5TKS +BYj/W3wayzaU/FD7NIbCbsHqc1rDNDutp3Y6B5z3tP3bSJ70FfoWfGWuuPG6uEJy +W5EHUbkBDQRXhl8XAQgAxQnYD9yvl19ULD3el+vhwUb+xIj2gkpyCfP3g6as68OR +6QsHfYyFrLxBCroGb/fx4AT240ikErplgYThr+fwVl8CXyWtdrgrUwU8DopTTiTN +xYxbxklljp8ZO8rJNPpIWJBTIUSZv+2sd+LrkcEocZ0tWsUoshlc3iBYtmiO+HbW +9yAxKHOkA3eooSZHERs8BIQ+ZLhv3x5FB73jbMYOIB0dqU2GrbDvFBnKx9AWheCd +JsOAlAlGnNcyI4ZDdJ33DozCUgalxmTMGrfPyCvz9zqKm1gQsscmrNFij/F9TeNY ++oEjRoXwwnyM5YiexMcxhLp2NPjagFU0lNS8gCFy2QARAQABiQEfBBgBCgAJBQJX +hl8XAhsMAAoJEGwNrHKLKdgXShUH/1rUNk9MvoZ9HBdvm7/z70J64cnNPjIwPuhO +5FMihCMmnsESjCgzrP6rVDOma4psf7fwEe8m1cltl8gVQ1cZIo2LO/0XnbBeo9b9 +hA+RqtKz9IZYqNzbvGxEbkhMf6O/TDSFmJpAueh8D3/Dgcrvya0bflkwoGl7RDKu +Iq68v4Ri1s4LAq8RCIsB85NKds2vLIAuMrhbhtwYEVgalPotMMHX/MMrKL5T95Ac +/GuySu+Yk7kmfrFq0SIzP1BFGv+l84ke18zMu0ssGHVGY0eaEEpO2aude+HhMJqD ++PmSM0ZDHsJu4It2PIIGtgGWfai9ddXOI2+z8W6ugsKr/tq7Sik= +=DlyX +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pubkey.gpg b/pubkey.gpg new file mode 100644 index 0000000..ebbc8d8 --- /dev/null +++ b/pubkey.gpg @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: signing for openfoam.com packages + +mQINBF6fBMQBEACqRTvEOYTj/c9VdywKrT8k59YWzMokpS78HsItpzPClH+inVSI +mXlW9vu8AFr+pBMNBVxIIgVJtc44cPsIR5O1rLoDqrjGO0PmTv9ayQZyVttav8u1 +8CM/NB8oNFpxzyQpx0nKByJmQSwd5W+aDQc5rf7EW43FGIiNS19xVhqizYbfurMt +0hFZ9LSTEBkjElIu91nxIxBNPq7xjzFbCFx2qKvQU9asbzP1SMF7k8l/e3WLQnWl +SkDnO0ElPYPhuRXNY1y74/c0eGrsyOfKmBtA/7NjJP9MlB1OXqYMuxLnOPi0EsXz +sw9XtAV36cBc0OMrqfkiodmlR9Bqy+wQSCigvFRdidVjDMO5PBq4pcVjcqBXhCGU +6EQ5mB5L9LI7qYUiZclkPSEgXcz02tTxC1SsjqVIScF/v1GPhuGupwj2RKpF+XXR +bebMSdYqiqs8oBkQdGYEPujt/CTBxjxRrDJYxqyhEZ5D8j3u66K0EJ/isGTJadzg +RbV67qWidjsh5Gs2rhzoyRXCAY04YXBNES7tTNw0gY1GvkqdH86jkk6y7gHzWOoe +R6KK2gNM0SccTUgMqgKg51KI2clXdjOCSR9lFCOsQ8CjXgizi/I8u2vU7s/lEe/D +casS9DRXPhvvReZq0vfMxsoMTiyZRnSuTRKMJH1pjcIwi8oCO1NWWjrcawARAQAB +tCJvcGVuZm9hbS1jb20gPGFkbWluQG9wZW5jZmQuY28udWs+iQJOBBMBCAA4FiEE +3JPAlhdBIuJW2iQGM4bddJSNII8FAl6fMBcCGwMFCwkIBwIGFQoJCAsCBBYCAwEC +HgECF4AACgkQM4bddJSNII8xmg/9FlJi4lXNzPj1jtNqHuKdDjvWfc19SdupoPJh +ox+BDokXaf252tDIvy7VljtoCdFsnKm/dVnrM39PrhBmX0cxaM6GoyvWlO3NyWtY +FaWgudNkLrU+wykYqv8YdYhtFA08rUPCuhqsi6YVRv3jFLGlygfIZwdSY3tnbOr9 +k/4bUP9kXcEJLVMErt7O3pFJ010p7IAYzYMk79W0q9wqpzmxmR5TiERfKMT1NEH0 +hTdgAWk3Y62PVNHs05cYQNt3m7s/6lho4Sk1+bzDzDiuYUAE4US61z+FXwoF0+MW +GFtVF90p8mAVR+jPA8jqBnuk2Q7ghiGBgFYFn7XBAJkclGwIMOEuv4I+YvINJ2EB +e/whJBukv6BN36BGbsJNEdwGLS2Oqpb4WCAhlrDrF3J5lPwrYvRItY+87Q+KAlZc +AcQnv2vplK8RWBauHC3K7+rgtJ1KwBhGa06zYUalufe8N6NEpwQuAh9QuIQfOhHd +nWe7yvv1aY22Ldj0ZUxTrmG0BZObLHcO8wdoY95uMxtCZZ6DR8rzpUDxUQoIjP3y +FbA5BjS2RLCXU1n927RlJ5Exu1g261Yduaf0qgMOlfaQYo8wj/MDlM+Vfz2yNpD/ +fqESgTpLDpl1Zu95BU649DV7M/x0ZwzyRhM1UsO3v2MXKWKgDz0drglCK3351XP/ +PfOLQKE= +=Slzt +-----END PGP PUBLIC KEY BLOCK-----