Merge pull request #83 from matt335672/update_actions

github actions: use canonical way to get ImageOS
This commit is contained in:
matt335672 2022-05-27 12:43:20 +01:00 committed by GitHub
commit 308b6f22ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,10 +8,12 @@ jobs:
name: install PA sources name: install PA sources
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# This is currently the only way to get a version into # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
# the cache tag name - see https://github.com/actions/cache/issues/543 # see https://github.com/actions/cache/issues/543
- run: | - name: Get operating system name and version.
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV id: os
run: echo "::set-output name=image::$ImageOS"
shell: bash
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache pulseaudio source - name: Cache pulseaudio source
uses: actions/cache@v2 uses: actions/cache@v2
@ -19,7 +21,7 @@ jobs:
cache-name: cache-pulseaudio-src cache-name: cache-pulseaudio-src
with: with:
path: ~/pulseaudio.src path: ~/pulseaudio.src
key: ${{ runner.os }}-${{ env.OS_VERSION }}-build-${{ env.cache-name }} key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }}
- run: scripts/install_pulseaudio_sources_apt.sh - run: scripts/install_pulseaudio_sources_apt.sh
build: build:
@ -40,17 +42,17 @@ jobs:
CFLAGS: -Wall -Wextra -Werror CFLAGS: -Wall -Wextra -Werror
steps: steps:
# This is currently the only way to get a version into - name: Get operating system name and version.
# the cache tag name - see https://github.com/actions/cache/issues/543 id: os
- run: | run: echo "::set-output name=image::$ImageOS"
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV shell: bash
- name: Fetch pulseaudio sources - name: Fetch pulseaudio sources
uses: actions/cache@v2 uses: actions/cache@v2
env: env:
cache-name: cache-pulseaudio-src cache-name: cache-pulseaudio-src
with: with:
path: ~/pulseaudio.src path: ~/pulseaudio.src
key: ${{ runner.os }}-${{ env.OS_VERSION }}-build-${{ env.cache-name }} key: ${{ steps.os.outputs.image }}-build-${{ env.cache-name }}
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: sudo apt-get update - run: sudo apt-get update
- run: sudo apt-get -yq install build-essential libpulse-dev - run: sudo apt-get -yq install build-essential libpulse-dev