diff options
| author | matt335672 <30179339+matt335672@users.noreply.github.com> | 2022-10-19 13:27:02 +0300 |
|---|---|---|
| committer | matt335672 <30179339+matt335672@users.noreply.github.com> | 2022-10-20 17:00:32 +0300 |
| commit | 2776ffc2802806526b1d1cf990e42fa6a96f9af8 (patch) | |
| tree | f911b94833d632d23e12d3e86e028d4c25e20fdb | |
| parent | d94a7388c872a02e73eca928caa73650617171cb (diff) | |
Update OS_VERSION environmental hack
| -rw-r--r-- | .github/workflows/build.yml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7974382..ecef9112 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,10 +130,11 @@ jobs: CPPCHECK_VER: 2.9 CPPCHECK_REPO: https://github.com/danmar/cppcheck.git steps: - # This is currently the only way to get a version into - # the cache tag name - see https://github.com/actions/cache/issues/543 - - run: | - echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV + # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20') + - name: Get operating system name and version. + id: os + run: echo "image=$ImageOS" >>$GITHUB_OUTPUT + shell: bash - uses: actions/checkout@v3 - name: Cache cppcheck uses: actions/cache@v3 @@ -141,7 +142,7 @@ jobs: cache-name: cache-cppcheck with: path: ~/cppcheck.local - key: ${{ runner.os }}-${{ env.OS_VERSION }}-build-${{ env.cache-name }}-${{ env.CPPCHECK_VER }} + key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }}-${{ env.CPPCHECK_VER }} - run: sudo scripts/install_cppcheck_dependencies_with_apt.sh - run: ./bootstrap - run: scripts/install_cppcheck.sh $CPPCHECK_REPO $CPPCHECK_VER @@ -157,10 +158,11 @@ jobs: ASTYLE_VER: 3.1 ASTYLE_REPO: https://svn.code.sf.net/p/astyle/code/tags steps: - # This is currently the only way to get a version into - # the cache tag name - see https://github.com/actions/cache/issues/543 - - run: | - echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV + # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20') + - name: Get operating system name and version. + id: os + run: echo "image=$ImageOS" >>$GITHUB_OUTPUT + shell: bash - uses: actions/checkout@v3 - name: Cache astyle uses: actions/cache@v3 @@ -168,7 +170,7 @@ jobs: cache-name: cache-astyle with: path: ~/astyle.local - key: ${{ runner.os }}-${{ env.OS_VERSION }}-build-${{ env.cache-name }}-${{ env.ASTYLE_VER }} + key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }}-${{ env.ASTYLE_VER }} - run: sudo scripts/install_astyle_dependencies_with_apt.sh - run: scripts/install_astyle.sh $ASTYLE_REPO $ASTYLE_VER - name: Format code with astyle |