Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VPN-6220: Fix MacOS Taskcluster jobs after bad squash/merge #9168

Merged
merged 1 commit into from
Feb 21, 2024

Conversation

oskirby
Copy link
Collaborator

@oskirby oskirby commented Feb 21, 2024

Description

We recently updated the Taskcluster jobs for MacOS to use conda-pack for the build environment to resolve some flaky build tasks, but it seems that this change got partially reverted by a squash/merge of PR #9090, and it no longer works because of a missing fetch dependency. This should put the use of conda-pack back.

Reference

Github issue: #9166 (VPN-6220)
Github PR: #9090

Checklist

  • My code follows the style guidelines for this project
  • I have not added any packages that contain high risk or unknown licenses (GPL, LGPL, MPL, etc. consult with DevOps if in question)
  • I have performed a self review of my own code
  • I have commented my code PARTICULARLY in hard to understand areas
  • I have added thorough tests where needed

@oskirby oskirby requested a review from brizental February 21, 2024 16:20
@oskirby oskirby force-pushed the vpn-6220-macos-build-fix branch from ab65053 to 288985d Compare February 21, 2024 16:22
Copy link
Collaborator

@strseb strseb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, just had the same fix :) LGTM
#9167

@oskirby oskirby marked this pull request as ready for review February 21, 2024 16:25
Copy link
Member

@lesleyjanenorton lesleyjanenorton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oskirby oskirby enabled auto-merge (squash) February 21, 2024 17:25
@github-actions github-actions bot added the 🛬 Landing This PR is marked as "auto-merge" label Feb 21, 2024
@oskirby oskirby merged commit 238ec12 into main Feb 21, 2024
132 of 133 checks passed
@oskirby oskirby deleted the vpn-6220-macos-build-fix branch February 21, 2024 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🛬 Landing This PR is marked as "auto-merge"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants