mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 13:37:30 +00:00
Fix test-packaging.yml action (#42570)
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #42573 Fixes failing test by replacing no-longer-supported `--no-quarantine` option with manually turning off quarantine for Wine. Successful run here: https://github.com/fleetdm/fleet/actions/runs/23661332211 --------- Co-authored-by: Allen Houchins <allenhouchins@mac.com>
This commit is contained in:
parent
3793777c8d
commit
7db99c7801
3 changed files with 24 additions and 22 deletions
40
.github/workflows/test-packaging.yml
vendored
40
.github/workflows/test-packaging.yml
vendored
|
|
@ -15,26 +15,26 @@ on:
|
|||
- patch-*
|
||||
- prepare-*
|
||||
paths:
|
||||
- 'cmd/fleetctl/**.go'
|
||||
- 'pkg/**.go'
|
||||
- 'server/context/**.go'
|
||||
- 'orbit/**.go'
|
||||
- 'ee/fleetctl/**.go'
|
||||
- 'tools/fleetctl-docker/**'
|
||||
- 'tools/wix-docker/**'
|
||||
- 'tools/bomutils-docker/**'
|
||||
- '.github/workflows/test-packaging.yml'
|
||||
- "cmd/fleetctl/**.go"
|
||||
- "pkg/**.go"
|
||||
- "server/context/**.go"
|
||||
- "orbit/**.go"
|
||||
- "ee/fleetctl/**.go"
|
||||
- "tools/fleetctl-docker/**"
|
||||
- "tools/wix-docker/**"
|
||||
- "tools/bomutils-docker/**"
|
||||
- ".github/workflows/test-packaging.yml"
|
||||
pull_request:
|
||||
paths:
|
||||
- 'cmd/fleetctl/**.go'
|
||||
- 'pkg/**.go'
|
||||
- 'server/context/**.go'
|
||||
- 'orbit/**.go'
|
||||
- 'ee/fleetctl/**.go'
|
||||
- 'tools/fleetctl-docker/**'
|
||||
- 'tools/wix-docker/**'
|
||||
- 'tools/bomutils-docker/**'
|
||||
- '.github/workflows/test-packaging.yml'
|
||||
- "cmd/fleetctl/**.go"
|
||||
- "pkg/**.go"
|
||||
- "server/context/**.go"
|
||||
- "orbit/**.go"
|
||||
- "ee/fleetctl/**.go"
|
||||
- "tools/fleetctl-docker/**"
|
||||
- "tools/wix-docker/**"
|
||||
- "tools/bomutils-docker/**"
|
||||
- ".github/workflows/test-packaging.yml"
|
||||
workflow_dispatch: # Manual
|
||||
|
||||
# This allows a subsequently queued workflow run to interrupt previous runs
|
||||
|
|
@ -55,7 +55,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-15]
|
||||
os: [ubuntu-latest, macos-15, macos-26]
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
|
|
@ -87,7 +87,7 @@ jobs:
|
|||
- name: Install wine and wix
|
||||
if: startsWith(matrix.os, 'macos')
|
||||
run: |
|
||||
./it-and-security/lib/macos/scripts/install-wine.sh -n
|
||||
./assets/scripts/install-wine.sh -n
|
||||
wget https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip -nv -O wix.zip
|
||||
mkdir wix
|
||||
unzip wix.zip -d wix
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@ brew_wine(){
|
|||
echo "# tap auto-generated by Fleet for installing wine-stable" > "$(dirname "${TAP_PATH}")/README.md"
|
||||
curl -O https://raw.githubusercontent.com/Homebrew/homebrew-cask/bad613d274f9a646dace4a4cc7f2512f836be5b4/Casks/w/wine-stable.rb
|
||||
mv wine-stable.rb "${TAP_PATH}/"
|
||||
brew install --cask --no-quarantine fleet/local/wine-stable; exit 0
|
||||
brew install --cask fleet/local/wine-stable
|
||||
xattr -dr com.apple.quarantine "$(brew --prefix)/Caskroom/wine-stable"
|
||||
exit 0
|
||||
}
|
||||
|
||||
|
||||
2
website/config/routes.js
vendored
2
website/config/routes.js
vendored
|
|
@ -1139,7 +1139,7 @@ module.exports.routes = {
|
|||
'GET /learn-more-about/enrolling-hosts': '/docs/using-fleet/adding-hosts',
|
||||
'GET /learn-more-about/setup-assistant': '/guides/setup-experience',
|
||||
'GET /learn-more-about/policy-automations': '/docs/using-fleet/automations',
|
||||
'GET /install-wine': 'https://github.com/fleetdm/fleet/blob/main/it-and-security/lib/macos/scripts/install-wine.sh',
|
||||
'GET /install-wine': 'https://github.com/fleetdm/fleet/blob/main/assets/scripts/install-wine.sh',
|
||||
'GET /learn-more-about/creating-service-accounts': 'https://console.cloud.google.com/projectselector2/iam-admin/serviceaccounts/create?walkthrough_id=iam--create-service-account&pli=1#step_index=1',
|
||||
'GET /learn-more-about/google-workspace-domains': 'https://admin.google.com/ac/domains/manage',
|
||||
'GET /learn-more-about/domain-wide-delegation': 'https://admin.google.com/ac/owl/domainwidedelegation',
|
||||
|
|
|
|||
Loading…
Reference in a new issue