Skip to content

GitHub Actions: preparations, part 2 #67733

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

Merged
merged 4 commits into from
Jan 8, 2020
Merged

Conversation

pietroalbini
Copy link
Member

This PR adds the second batch of commits in preparation for GitHub Actions:

  • Removed hardcoded Azure Pipelines variables from publish_toolstate.sh
  • Fixed a bug in shared.sh's GitHub Actions support
  • Fixed binutils missing from MSYS2 on Windows 2019 (GitHub Actions-specific)
  • Fixed wrong sysroot in macOS 10.15 onwards (GitHub Actions-specific)

This PR does not yet add any builders on GitHub Actions.

r? @alexcrichton

In their infinite wisdom, Apple decided that (starting from macOS 10.15
onwards) /usr/include is not the location we should all search in for
our beloved C headers. Instead, we should look inside the extremely
intuitive and easily guessable new path:

/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include

Because why not.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 30, 2019
@@ -6,7 +6,8 @@ IFS=$'\n\t'
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"

if isWindows; then
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar \
binutils
Copy link
Contributor

Choose a reason for hiding this comment

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

It's weird, they are provided by mingw-w64 toolchain (in a version that really works for Windows).

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 6, 2020

📌 Commit 39ddbeb has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 6, 2020
@bors
Copy link
Collaborator

bors commented Jan 8, 2020

⌛ Testing commit 39ddbeb with merge f48e576...

bors added a commit that referenced this pull request Jan 8, 2020
GitHub Actions: preparations, part 2

This PR adds the second batch of commits in preparation for GitHub Actions:

* Removed hardcoded Azure Pipelines variables from `publish_toolstate.sh`
* Fixed a bug in `shared.sh`'s GitHub Actions support
* Fixed binutils missing from MSYS2 on Windows 2019 (GitHub Actions-specific)
* Fixed wrong sysroot in macOS 10.15 onwards (GitHub Actions-specific)

This PR does **not** yet add any builders on GitHub Actions.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Jan 8, 2020

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing f48e576 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2020
@bors bors merged commit 39ddbeb into rust-lang:master Jan 8, 2020
@rust-highfive
Copy link
Contributor

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

set -euo pipefail
IFS=$'\n\t'

source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
Copy link
Member

Choose a reason for hiding this comment

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

Probably source "$(cd "$(dirname "$0")" && pwd)/shared.sh"?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants