Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-24 16:41:39 +02:00
Code Issues Releases Wiki Activity

Revert four previous commits

Browse Source 
This reverts head to before commit 460a2f819d76cc42e69f788918e78c7aa59fcca8

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/591
Reference-to: https://github.com/tenacityteam/tenacity/pull/592
Reference-to: https://github.com/tenacityteam/tenacity/pull/598
Reference-to: https://github.com/tenacityteam/tenacity/pull/599
This commit is contained in:
Emily Mabrey 2021-09-11 11:44:39 -04:00
parent ae8fe40448
commit 5cb9586107
No known key found for this signature in database
GPG Key ID: 6F4EF47256A1B7DC
2 changed files with 16 additions and 5 deletions

19
.github/workflows/cmake_build.yml vendored

@ -27,12 +27,21 @@ jobs:
os: ubuntu-20.04 os: ubuntu-20.04
arch: x86_64 arch: x86_64
vcpkg_triplet: x64-linux vcpkg_triplet: x64-linux
CMAKE_GENERATOR: Ninja
- name: macOS - Big Sur 11 (Intel) - Ninja - name: macOS - Big Sur 11 (Intel) - Ninja
id: macos-bigsur-1100-intel-x64_osx_1012min-ninja id: macos-bigsur-1100-intel-x64_osx_1012min-ninja
os: macos-11 os: macos-11
arch: Intel arch: Intel
vcpkg_triplet: x64-osx-10.12min vcpkg_triplet: x64-osx-10.12min
CMAKE_GENERATOR: Ninja
- name: macOS - Catalina 10.15 (Intel) - Ninja
id: macos-catalina-1015-intel-x64_osx_1012min-ninja
os: macos-10.15
arch: Intel
vcpkg_triplet: x64-osx-10.12min
CMAKE_GENERATOR: Ninja
- name: Windows - Server 2019 (amd64) - Visual Studio 2019 - name: Windows - Server 2019 (amd64) - Visual Studio 2019
id: windows-server-2019-amd64-x64_windows-vs2019_x64 id: windows-server-2019-amd64-x64_windows-vs2019_x64
@ -55,12 +64,14 @@ jobs:
os: windows-2019 os: windows-2019
arch: amd64 arch: amd64
vcpkg_triplet: x64-windows vcpkg_triplet: x64-windows
CMAKE_GENERATOR: Ninja
- name: Windows - Server 2019 (win32) - Ninja - name: Windows - Server 2019 (win32) - Ninja
id: windows-server-2019-x86-x86_windows-ninja id: windows-server-2019-x86-x86_windows-ninja
os: windows-2019 os: windows-2019
arch: x86 arch: x86
vcpkg_triplet: x86-windows vcpkg_triplet: x86-windows
CMAKE_GENERATOR: Ninja
env: env:
@ -70,7 +81,7 @@ jobs:
# CMake settings # CMake settings
CMAKE_BUILD_TYPE: MinSizeRel CMAKE_BUILD_TYPE: MinSizeRel
CMAKE_GENERATOR: Ninja CMAKE_GENERATOR: ${{matrix.config.CMAKE_GENERATOR}}
CMAKE_GENERATOR_PLATFORM: ${{matrix.config.CMAKE_GENERATOR_PLATFORM}} CMAKE_GENERATOR_PLATFORM: ${{matrix.config.CMAKE_GENERATOR_PLATFORM}}
# vcpkg settings # vcpkg settings
@ -98,6 +109,9 @@ jobs:
with: with:
submodules: true submodules: true
- name: Get Git commit of vcpkg submodule
run: echo VCPKG_COMMIT=$(git ls-tree HEAD vcpkg | awk '{print $3}') >> ${GITHUB_ENV}
- name: Setup platform specific environmental variables - name: Setup platform specific environmental variables
run: | run: |
if [[ "${{runner.os}}" == "Windows" ]]; then if [[ "${{runner.os}}" == "Windows" ]]; then
@ -200,9 +214,6 @@ jobs:
iwr -useb get.scoop.sh | iex iwr -useb get.scoop.sh | iex
scoop install sccache scoop install sccache
- name: Get Git commit of vcpkg submodule
run: echo VCPKG_COMMIT=$(git ls-tree HEAD vcpkg | awk '{print $3}') >> ${GITHUB_ENV}
# Cache the vcpkg cache and the vcpkg executable to avoid bootstrapping each time # Cache the vcpkg cache and the vcpkg executable to avoid bootstrapping each time
- name: Setup vcpkg cache - name: Setup vcpkg cache
uses: actions/cache@v2 uses: actions/cache@v2

2
.github/workflows/flatpak.yml vendored

@ -1,4 +1,4 @@
name: Flatpak name: Packaging
on: on:
push: push:
branches: [master] branches: [master]