From 934f7c6696eef8aba742c245d0f01ca831dc59e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 20 Nov 2021 09:00:30 +0100 Subject: [PATCH 1/9] Switch to mainfest mode --- .github/workflows/build.yml | 126 +++++++++++++----------------------- vcpkg.json | 11 ++++ 2 files changed, 57 insertions(+), 80 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b690042e998b58..ecbe4da6704996 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,7 @@ jobs: include: - os: windows-2019 vcpkg_path: C:\mixxx-vcpkg + exe_suffix: .exe vcpkg_bootstrap: .\bootstrap-vcpkg.bat vcpkg_triplet: x64-windows vcpkg_host_triplet: x64-windows @@ -26,47 +27,6 @@ jobs: vcpkg_cache: /Users/runner/.cache/vcpkg/archives check_disk_space: df -h env: - VCPKG_PACKAGES: >- - ableton-link - benchmark - chromaprint - fdk-aac - ffmpeg - fftw3 - grantlee - gtest - hidapi - hss1394 - libdjinterop - libebur128 - libflac - libkeyfinder - libmodplug - libogg - libopusenc - libsndfile[core] - libusb - libvorbis - lilv - mp3lame - ms-gsl - opus - opusfile - portaudio[asio] - portmidi - protobuf - pthreads - qt5compat - qtbase - qtdeclarative - qtsvg - qttranslations - qtkeychain-qt6 - rubberband - soundtouch - taglib - wavpack - ${{ matrix.vcpkg_packages_extras }} VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }} # Using the relative path overlay/triplets does not work (https://github.com/microsoft/vcpkg/issues/18764) @@ -88,6 +48,14 @@ jobs: # to keep the build path short and work around size limits on the windows runner D: drive - name: Move checkout run: cmake -E copy_directory ${{ github.workspace }}/mixxx-vcpkg ${{ matrix.vcpkg_path }} + + - name: "Authenticate to GitHub Packages" + if: runner.os != 'Linux' + shell: bash + run: | + nuget sources add -Name mixxx-github-packages -Source https://nuget.pkg.github.com/mixxxdj/index.json -Username ${{ github.repository_owner }} -Password ${{ secrets.GITHUB_TOKEN }} -NonInteractive + nuget setapikey ${{ secrets.GITHUB_TOKEN }} -Source mixxx-github-packages -NonInteractive + echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,readwrite;" >> "${GITHUB_ENV}" - name: Read sha_short id: vars @@ -95,6 +63,16 @@ jobs: run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT working-directory: ${{ matrix.vcpkg_path }} + # Cache the vcpkg executable to avoid bootstrapping each time + - name: "Setup vcpkg executable cache" + uses: actions/cache@v3 + with: + path: ${{ matrix.vcpkg_path }}/vcpkg${{ matrix.exe_suffix }} + key: vcpkg-tool-${{ matrix.vcpkg_host_triplet }}-${{ github.ref }}-${{ github.run_number }} + restore-keys: | + key: vcpkg-tool-${{ matrix.vcpkg_host_triplet }}-${{ github.ref }} + key: vcpkg-tool-${{ matrix.vcpkg_host_triplet }} + - name: Bootstrap vcpkg run: ${{ matrix.vcpkg_bootstrap }} working-directory: ${{ matrix.vcpkg_path }} @@ -105,24 +83,12 @@ jobs: brew update && brew install nasm automake pkg-config autoconf-archive /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer" xcrun --show-sdk-version - - name: Set up cache - uses: actions/cache@v3 - with: - path: ${{ matrix.vcpkg_path }}/installed - key: vcpkg-installed-${{ matrix.vcpkg_triplet }}-${{ github.ref }}-${{ github.run_number }} - restore-keys: | - vcpkg-installed-${{ matrix.vcpkg_triplet }}-${{ github.ref }} - vcpkg-installed-${{ matrix.vcpkg_triplet }} - name: Check available disk space run: ${{ matrix.check_disk_space }} - - - name: Remove outdated packages from cache - run: ./vcpkg remove --vcpkg-root=${{ matrix.vcpkg_path }} --outdated --recurse - working-directory: ${{ matrix.vcpkg_path }} - - name: Build packages - run: ./vcpkg install --vcpkg-root=${{ matrix.vcpkg_path }} --clean-after-build --recurse ${{ env.VCPKG_PACKAGES }} + - name: Build packages + run: ./vcpkg install --vcpkg-root=${{ matrix.vcpkg_path }} --clean-after-build --recurse --feature-flags="-compilertracking,manifests,registries,versions" --x-abi-tools-use-exact-versions working-directory: ${{ matrix.vcpkg_path }} - name: Upload GitHub Actions artifacts of build logs @@ -132,38 +98,38 @@ jobs: name: logs-${{ matrix.vcpkg_triplet }} path: ${{ matrix.vcpkg_path }}/buildtrees/**/*.log - - name: Create buildenv archive - run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} - working-directory: ${{ matrix.vcpkg_path }} + #- name: Create buildenv archive + # run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} + # working-directory: ${{ matrix.vcpkg_path }} - - name: "[Windows] Install additional tools" - if: runner.os == 'Windows' && env.SSH_PASSWORD != null - env: - SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} - run: | - $Env:PATH="C:\msys64\usr\bin;$Env:PATH" - pacman -S --noconfirm coreutils bash rsync openssh - Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH" + #- name: "[Windows] Install additional tools" + # if: runner.os == 'Windows' && env.SSH_PASSWORD != null + # env: + # SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} + # run: | + # $Env:PATH="C:\msys64\usr\bin;$Env:PATH" + # pacman -S --noconfirm coreutils bash rsync openssh + # Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH" - - name: "Upload build to downloads.mixxx.org" - if: github.event_name == 'push' && env.SSH_PASSWORD != null - run: bash .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip - working-directory: ${{ matrix.vcpkg_path }} - env: - DESTDIR: public_html/downloads/dependencies - OS: ${{ runner.os }} - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - SSH_HOST: downloads-hostgator.mixxx.org - SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }} - SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} - SSH_USER: mixxx - UPLOAD_ID: ${{ github.run_id }} + #- name: "Upload build to downloads.mixxx.org" + # if: github.event_name == 'push' && env.SSH_PASSWORD != null + # run: bash .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip + # working-directory: ${{ matrix.vcpkg_path }} + # env: + # DESTDIR: public_html/downloads/dependencies + # OS: ${{ runner.os }} + # SSH_AUTH_SOCK: /tmp/ssh_agent.sock + # SSH_HOST: downloads-hostgator.mixxx.org + # SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }} + # SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} + # SSH_USER: mixxx + # UPLOAD_ID: ${{ github.run_id }} - name: Upload GitHub Actions artifacts uses: actions/upload-artifact@v3 with: name: ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} - path: ${{ matrix.vcpkg_path }}/${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip + path: ${{ matrix.vcpkg_path }}/vcpkg_installed # Workaround for https://github.com/actions/cache/issues/531 - name: Use system tar & zstd from Chocolatey for caching diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000000000..7b57adb43fcfaf --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mixxx", + "version": "2.4.0", + "description": "Mixxx is free cross platform DJ software", + "homepage": "https://mixxx.org/", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + "chromaprint" + ] + } From e241053b4c90def6b3578113b375b2a3fa692469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 16 Aug 2023 22:50:20 +0200 Subject: [PATCH 2/9] Use read only nuget access in case of a pull request --- .github/workflows/build.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecbe4da6704996..fda480e4a5b850 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,13 +49,21 @@ jobs: - name: Move checkout run: cmake -E copy_directory ${{ github.workspace }}/mixxx-vcpkg ${{ matrix.vcpkg_path }} - - name: "Authenticate to GitHub Packages" - if: runner.os != 'Linux' + - name: "Authenticate to GitHub Packages (readwrite)" + if: runner.os != 'Linux' && github.event_name == 'push' shell: bash run: | nuget sources add -Name mixxx-github-packages -Source https://nuget.pkg.github.com/mixxxdj/index.json -Username ${{ github.repository_owner }} -Password ${{ secrets.GITHUB_TOKEN }} -NonInteractive nuget setapikey ${{ secrets.GITHUB_TOKEN }} -Source mixxx-github-packages -NonInteractive echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,readwrite;" >> "${GITHUB_ENV}" + + - name: "Authenticate to GitHub Packages (read only)" + if: runner.os != 'Linux' && github.event_name == 'pull_request' + shell: bash + run: | + nuget sources add -Name mixxx-github-packages -Source https://nuget.pkg.github.com/mixxxdj/index.json -Username ${{ github.repository_owner }} -Password ${{ secrets.GITHUB_TOKEN }} -NonInteractive + nuget setapikey ${{ secrets.GITHUB_TOKEN }} -Source mixxx-github-packages -NonInteractive + echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,read;" >> "${GITHUB_ENV}" - name: Read sha_short id: vars From fd41c0f2dff08d4e1c4e8bdf1e7a83175a46857f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 24 Oct 2023 12:05:17 +0200 Subject: [PATCH 3/9] enable package export --- .github/workflows/build.yml | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fda480e4a5b850..4b675b381fda7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,38 +106,38 @@ jobs: name: logs-${{ matrix.vcpkg_triplet }} path: ${{ matrix.vcpkg_path }}/buildtrees/**/*.log - #- name: Create buildenv archive - # run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} - # working-directory: ${{ matrix.vcpkg_path }} + - name: Create buildenv archive + run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} --output-dir=${{ matrix.vcpkg_path }} + working-directory: ${{ matrix.vcpkg_path }} - #- name: "[Windows] Install additional tools" - # if: runner.os == 'Windows' && env.SSH_PASSWORD != null - # env: - # SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} - # run: | - # $Env:PATH="C:\msys64\usr\bin;$Env:PATH" - # pacman -S --noconfirm coreutils bash rsync openssh - # Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH" + - name: "[Windows] Install additional tools" + if: runner.os == 'Windows' && env.SSH_PASSWORD != null + env: + SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} + run: | + $Env:PATH="C:\msys64\usr\bin;$Env:PATH" + pacman -S --noconfirm coreutils bash rsync openssh + Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH" - #- name: "Upload build to downloads.mixxx.org" - # if: github.event_name == 'push' && env.SSH_PASSWORD != null - # run: bash .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip - # working-directory: ${{ matrix.vcpkg_path }} - # env: - # DESTDIR: public_html/downloads/dependencies - # OS: ${{ runner.os }} - # SSH_AUTH_SOCK: /tmp/ssh_agent.sock - # SSH_HOST: downloads-hostgator.mixxx.org - # SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }} - # SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} - # SSH_USER: mixxx - # UPLOAD_ID: ${{ github.run_id }} + - name: "Upload build to downloads.mixxx.org" + if: github.event_name == 'push' && env.SSH_PASSWORD != null + run: bash .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip + working-directory: ${{ matrix.vcpkg_path }} + env: + DESTDIR: public_html/downloads/dependencies + OS: ${{ runner.os }} + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + SSH_HOST: downloads-hostgator.mixxx.org + SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }} + SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }} + SSH_USER: mixxx + UPLOAD_ID: ${{ github.run_id }} - name: Upload GitHub Actions artifacts uses: actions/upload-artifact@v3 with: name: ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} - path: ${{ matrix.vcpkg_path }}/vcpkg_installed + path: ${{ matrix.vcpkg_path }}/${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip # Workaround for https://github.com/actions/cache/issues/531 - name: Use system tar & zstd from Chocolatey for caching From ff00d4db4a114e30412cd1e022a675b7d22a93f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 12 Nov 2023 15:53:14 +0100 Subject: [PATCH 4/9] Grand package write permission --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b675b381fda7d..82a68f25ee346a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,10 @@ name: Build on: [pull_request, push] +permissions: + contents: read # Fetch code (actions/checkout) + packages: write # Upload and publish packages to GitHub Packages + jobs: build: strategy: From 365e667bacad98acecaf542649f6df01c1a159bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 12 Nov 2023 17:14:37 +0100 Subject: [PATCH 5/9] Add Quotes --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82a68f25ee346a..386bc37b3277ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,16 +57,16 @@ jobs: if: runner.os != 'Linux' && github.event_name == 'push' shell: bash run: | - nuget sources add -Name mixxx-github-packages -Source https://nuget.pkg.github.com/mixxxdj/index.json -Username ${{ github.repository_owner }} -Password ${{ secrets.GITHUB_TOKEN }} -NonInteractive - nuget setapikey ${{ secrets.GITHUB_TOKEN }} -Source mixxx-github-packages -NonInteractive + nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText + nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,readwrite;" >> "${GITHUB_ENV}" - name: "Authenticate to GitHub Packages (read only)" if: runner.os != 'Linux' && github.event_name == 'pull_request' shell: bash run: | - nuget sources add -Name mixxx-github-packages -Source https://nuget.pkg.github.com/mixxxdj/index.json -Username ${{ github.repository_owner }} -Password ${{ secrets.GITHUB_TOKEN }} -NonInteractive - nuget setapikey ${{ secrets.GITHUB_TOKEN }} -Source mixxx-github-packages -NonInteractive + nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText + nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,read;" >> "${GITHUB_ENV}" - name: Read sha_short From 888159f00e52cbcdc1580f4971db219aebfc9b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 14 Nov 2023 23:46:53 +0100 Subject: [PATCH 6/9] Add all packages to the manifest file --- .github/workflows/build.yml | 2 -- vcpkg.json | 58 +++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 386bc37b3277ab..e6933a436feefe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,6 @@ jobs: vcpkg_triplet: x64-windows vcpkg_host_triplet: x64-windows vcpkg_overlay_ports: overlay/windows;overlay/ports - vcpkg_packages_extras: libid3tag libmad check_disk_space: Get-PSDrive - os: macos-11 vcpkg_path: /Users/runner/mixxx-vcpkg @@ -27,7 +26,6 @@ jobs: vcpkg_triplet: x64-osx-min1015 vcpkg_host_triplet: x64-osx-min1015 vcpkg_overlay_ports: overlay/osx:overlay/ports - vcpkg_packages_extras: vcpkg_cache: /Users/runner/.cache/vcpkg/archives check_disk_space: df -h env: diff --git a/vcpkg.json b/vcpkg.json index 7b57adb43fcfaf..c83ca425fa96da 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,6 +6,58 @@ "license": "GPL-2.0-or-later", "supports": "!uwp", "dependencies": [ - "chromaprint" - ] - } + "ableton", + "benchmark", + "chromaprint", + "fdk-aac", + "ffmpeg", + "fftw3", + "grantlee", + "gtest", + "hidapi", + "hss1394", + "libdjinterop", + "libebur128", + "libflac", + { + "name": "libid3tag", + "platform": "!osx" + }, + "libkeyfinder", + { + "name": "libmad", + "platform": "!osx" + }, + "libmodplug", + "libogg", + "libopusenc", + { + "name": "libsndfile", + "default-features": false + }, + "libusb", + "libvorbis", + "lilv", + "mp3lame", + "ms-gsl", + "opus", + "opusfile", + { + "name": "portaudio", + "features": ["asio"] + }, + "portmidi", + "protobuf", + "pthreads", + "qt5compat", + "qtbase", + "qtdeclarative", + "qtsvg", + "qttranslations", + "qtkeychain-qt6", + "rubberband", + "soundtouch", + "taglib", + "wavpack" + ] +} From 06b420b1c0ab0e8d5b89c705e402348f6ef34097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 15 Nov 2023 19:25:07 +0100 Subject: [PATCH 7/9] Only use mixxxdj for packages --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6933a436feefe..929d302c893009 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,19 +52,19 @@ jobs: run: cmake -E copy_directory ${{ github.workspace }}/mixxx-vcpkg ${{ matrix.vcpkg_path }} - name: "Authenticate to GitHub Packages (readwrite)" - if: runner.os != 'Linux' && github.event_name == 'push' + if: runner.os != 'Linux' && github.event_name == 'push' && github.repository_owner == 'mixxxdj' shell: bash run: | - nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText - nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" + nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/mixxxdj/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText + nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "mixxx-github-packages" echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,readwrite;" >> "${GITHUB_ENV}" - name: "Authenticate to GitHub Packages (read only)" - if: runner.os != 'Linux' && github.event_name == 'pull_request' + if: runner.os != 'Linux' && (github.event_name == 'pull_request' || github.repository_owner != 'mixxxdj') shell: bash run: | - nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText - nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" + nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/mixxxdj/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText + nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "mixxx-github-packages" echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,read;" >> "${GITHUB_ENV}" - name: Read sha_short From cb4e293dee962caf544ed09022ce7d4498123d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 15 Nov 2023 21:01:34 +0100 Subject: [PATCH 8/9] Update dependency name to `ableton-link` --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index c83ca425fa96da..2e279c4c78f86a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,7 +6,7 @@ "license": "GPL-2.0-or-later", "supports": "!uwp", "dependencies": [ - "ableton", + "ableton-link", "benchmark", "chromaprint", "fdk-aac", From 1529e6fd88f18e9a4e26a5ae26c97d943e54454a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 15 Nov 2023 22:14:06 +0100 Subject: [PATCH 9/9] Remove Cache entirely Caching with down and upload is slower than a fresh download --- .github/workflows/build.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 929d302c893009..ca9eaead3e06f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,6 @@ jobs: include: - os: windows-2019 vcpkg_path: C:\mixxx-vcpkg - exe_suffix: .exe vcpkg_bootstrap: .\bootstrap-vcpkg.bat vcpkg_triplet: x64-windows vcpkg_host_triplet: x64-windows @@ -26,7 +25,6 @@ jobs: vcpkg_triplet: x64-osx-min1015 vcpkg_host_triplet: x64-osx-min1015 vcpkg_overlay_ports: overlay/osx:overlay/ports - vcpkg_cache: /Users/runner/.cache/vcpkg/archives check_disk_space: df -h env: VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} @@ -73,16 +71,6 @@ jobs: run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT working-directory: ${{ matrix.vcpkg_path }} - # Cache the vcpkg executable to avoid bootstrapping each time - - name: "Setup vcpkg executable cache" - uses: actions/cache@v3 - with: - path: ${{ matrix.vcpkg_path }}/vcpkg${{ matrix.exe_suffix }} - key: vcpkg-tool-${{ matrix.vcpkg_host_triplet }}-${{ github.ref }}-${{ github.run_number }} - restore-keys: | - key: vcpkg-tool-${{ matrix.vcpkg_host_triplet }}-${{ github.ref }} - key: vcpkg-tool-${{ matrix.vcpkg_host_triplet }} - - name: Bootstrap vcpkg run: ${{ matrix.vcpkg_bootstrap }} working-directory: ${{ matrix.vcpkg_path }}