Browse Source

Fix a typo, run tests for libvorbis and libogg

Signed-off-by: falkTX <falktx@falktx.com>
pull/25/head
falkTX 3 years ago
parent
commit
1891c16124
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 14 additions and 6 deletions
  1. +6
    -6
      .github/workflows/bootstrap.yml
  2. +8
    -0
      bootstrap-common.sh

+ 6
- 6
.github/workflows/bootstrap.yml View File

@@ -41,18 +41,18 @@ jobs:
path: |
~/PawPawBuilds
key: bootstrap-common-${{ matrix.target }}
- name: [apt] Restore debian package cache
- name: (apt) Restore debian package cache
if: ${{ matrix.installer == 'apt' }}
run: |
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
fi
- name: [apt] Fix GitHub's mess
- name: (apt) Fix GitHub's mess
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
- name: [apt] Set up dependencies (apt)
- name: (apt) Set up dependencies (apt)
if: ${{ matrix.installer == 'apt' }}
run: |
sudo apt-get update -qq
@@ -71,16 +71,16 @@ jobs:
if [ '${{ matrix.target }}' == 'win64' ]; then \
sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable; \
fi
- name: [homebrew] Set up dependencies
- name: (homebrew) Set up dependencies
if: ${{ matrix.installer == 'homebrew' }}
run: |
brew install cmake jq meson
- name: [homebrew] Fix up Xcode
- name: (homebrew) Fix up Xcode
if: ${{ matrix.installer == 'homebrew' }}
run: |
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
sudo xcode-select -s "/Applications/Xcode_12.3.app"
- name: [apt] Cache debian packages
- name: (apt) Cache debian packages
if: ${{ matrix.installer == 'apt' }}
run: |
mkdir -p ~/PawPawBuilds/debs


+ 8
- 0
bootstrap-common.sh View File

@@ -118,6 +118,10 @@ fi
download libogg "${LIBOGG_VERSION}" "${LIBOGG_URL}"
build_autoconf libogg "${LIBOGG_VERSION}"

if [ "${CROSS_COMPILING}" -eq 0 ]; then
run_make libogg "${LIBOGG_VERSION}" check
fi

# ---------------------------------------------------------------------------------------------------------------------
# libvorbis

@@ -126,6 +130,10 @@ LIBVORBIS_EXTRAFLAGS="--disable-examples"
download libvorbis "${LIBVORBIS_VERSION}" "${LIBVORBIS_URL}"
build_autoconf libvorbis "${LIBVORBIS_VERSION}" "${LIBVORBIS_EXTRAFLAGS}"

if [ "${CROSS_COMPILING}" -eq 0 ]; then
run_make libvorbis "${LIBVORBIS_VERSION}" check
fi

# ---------------------------------------------------------------------------------------------------------------------
# flac



Loading…
Cancel
Save