establish immutable source for RUST_CONFIGURE_ARGS #69894

vtbassmatt · 2020-03-10T17:47:38Z

rust-highfive · 2020-03-10T17:47:41Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pietroalbini (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

nellshamrell · 2020-03-10T19:41:12Z

Sweet! Currently we only run Linux tests on PRs, but I will fork this and run the Windows and Mac tests on it as well. Will update on the results here by EOD or early tomorrow :)

nellshamrell · 2020-03-12T21:34:06Z

src/ci/azure-pipelines/auto.yml

@@ -85,7 +85,7 @@ jobs:

      dist-x86_64-apple:
        SCRIPT: ./x.py dist
-        RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
+        IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc


Suggested change

IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc

INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc

vtbassmatt · 2020-03-12T22:31:52Z

Well that's embarrassing. I'm not near a capable machine right now but will get that fixed.

vtbassmatt · 2020-03-13T13:00:02Z

Fixed it.

pietroalbini · 2020-03-13T16:21:26Z

r? @nellshamrell

nellshamrell · 2020-03-13T17:03:55Z

Testing in #69963

Test azure vars Please disregard this pull request - I am opening it only to run all builds on #69894

nellshamrell · 2020-03-18T15:07:22Z

All Windows builds pass! Running on the mac builds and then I think this is good to go!

nellshamrell · 2020-03-18T16:59:59Z

Unfortunately, MacOS builds are currently failing for this change https://dev.azure.com/rust-lang/rust/_build/results?buildId=23626&view=logs&j=1c64c3ff-4c37-56fe-a133-b407354bbfbf&t=4e7ef4c5-557b-57f3-58fa-8cf5d2629d9a&l=16

The reason is MacOS ships with Bash 3.163.1. This line:

src/ci/scripts/setup-environment.sh

if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then

Will only work with Bash 4.2 and above (when the ability to define [[ -v FOO ]] was added).

vtbassmatt · 2020-03-18T18:40:45Z

Ah, dang it, of course.

Can anyone suggest a Bash 3-compatible way of testing for the existence of a variable? Everything else I found failed under set -u.

nellshamrell · 2020-03-18T20:01:45Z

I think I've got one here

if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then
    INITIAL_RUST_CONFIG=""
    echo "No initial Rust Configure Args set"
else
    INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}"
    ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"
fi

Working on testing it

Test azure vars Please disregard this pull request - I am opening it only to run all builds on #69894

nellshamrell · 2020-03-20T16:48:11Z

src/ci/scripts/setup-environment.sh

+# Since matrix variables are readonly in Azure Pipelines, we take
+# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS
+# which downstream steps can alter
+if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then
+    ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}"
+fi


Suggested change

# Since matrix variables are readonly in Azure Pipelines, we take

# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS

# which downstream steps can alter

if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then

ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}"

fi

# Since matrix variables are readonly in Azure Pipelines, we take

# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS

# which downstream steps can alter

# MacOS ships with Bash 3.16, which means we cannot use

# if [[ -v FOO ]], as that was introduced in Bash 4.2

if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then

INITIAL_RUST_CONFIG=""

echo "No initial Rust Configure Args set"

else

INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}"

ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"

fi

Confirmed through testing that this block works with Linux, Mac, and Windows builds!

Shamelessly stealing now!

nellshamrell · 2020-03-23T16:38:56Z

This is good to merge!

nellshamrell · 2020-03-23T16:41:11Z

@bors r+

bors · 2020-03-23T16:41:13Z

📌 Commit 6db4bb6 has been approved by nellshamrell

bors · 2020-03-24T04:08:58Z

⌛ Testing commit 6db4bb6 with merge 4e44081dc4b4d9560beb1e6e8c6d2aee267a8255...

Centril · 2020-03-24T04:16:42Z

@bors retry yielding to r0llup

bors · 2020-03-24T09:38:47Z

⌛ Testing commit 6db4bb6 with merge 1add455...

bors · 2020-03-24T12:42:45Z

☀️ Test successful - checks-azure
Approved by: nellshamrell
Pushing 1add455 to master...

establish immutable source for RUST_CONFIGURE_ARGS

ec7010a

rust-highfive assigned pietroalbini Mar 10, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2020

This comment has been minimized.

Sign in to view

fix how we detect an unset variable

a942b39

This was referenced Mar 10, 2020

split configure args into two environmental variables #69872

Closed

Test azure vars #69963

Closed

nellshamrell reviewed Mar 12, 2020

View reviewed changes

fix a glaring typo

3302334

rust-highfive assigned nellshamrell and unassigned pietroalbini Mar 13, 2020

bors added a commit that referenced this pull request Mar 14, 2020

Auto merge of #69963 - nellshamrell:test-azure-vars, r=<try>

c5ff6fc

Test azure vars Please disregard this pull request - I am opening it only to run all builds on #69894

bors added a commit that referenced this pull request Mar 16, 2020

Auto merge of #69963 - nellshamrell:test-azure-vars, r=<try>

16e4c1e

Test azure vars Please disregard this pull request - I am opening it only to run all builds on #69894

bors added a commit that referenced this pull request Mar 18, 2020

Auto merge of #69963 - nellshamrell:test-azure-vars, r=<try>

58f8eae

Test azure vars Please disregard this pull request - I am opening it only to run all builds on #69894

nellshamrell reviewed Mar 20, 2020

View reviewed changes

compat with macOS's ancient Bash

6db4bb6

nellshamrell approved these changes Mar 23, 2020

View reviewed changes

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 Mar 23, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 24, 2020

bors merged commit 1add455 into rust-lang:master Mar 24, 2020

bors mentioned this pull request Mar 24, 2020

Add GitHub Actions configuration #70190

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

establish immutable source for RUST_CONFIGURE_ARGS #69894

establish immutable source for RUST_CONFIGURE_ARGS #69894

vtbassmatt commented Mar 10, 2020

rust-highfive commented Mar 10, 2020

This comment has been minimized.

nellshamrell commented Mar 10, 2020

nellshamrell Mar 12, 2020 •

edited

Loading

vtbassmatt commented Mar 12, 2020

vtbassmatt commented Mar 13, 2020

pietroalbini commented Mar 13, 2020

nellshamrell commented Mar 13, 2020

nellshamrell commented Mar 18, 2020

nellshamrell commented Mar 18, 2020 •

edited

Loading

vtbassmatt commented Mar 18, 2020

nellshamrell commented Mar 18, 2020

nellshamrell Mar 20, 2020

nellshamrell Mar 20, 2020

vtbassmatt Mar 20, 2020

nellshamrell commented Mar 23, 2020

nellshamrell commented Mar 23, 2020

bors commented Mar 23, 2020

bors commented Mar 24, 2020

Centril commented Mar 24, 2020

bors commented Mar 24, 2020

bors commented Mar 24, 2020

	IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
	INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc

establish immutable source for RUST_CONFIGURE_ARGS #69894

establish immutable source for RUST_CONFIGURE_ARGS #69894

Conversation

vtbassmatt commented Mar 10, 2020

rust-highfive commented Mar 10, 2020

This comment has been minimized.

nellshamrell commented Mar 10, 2020

nellshamrell Mar 12, 2020 • edited Loading

Choose a reason for hiding this comment

vtbassmatt commented Mar 12, 2020

vtbassmatt commented Mar 13, 2020

pietroalbini commented Mar 13, 2020

nellshamrell commented Mar 13, 2020

nellshamrell commented Mar 18, 2020

nellshamrell commented Mar 18, 2020 • edited Loading

vtbassmatt commented Mar 18, 2020

nellshamrell commented Mar 18, 2020

nellshamrell Mar 20, 2020

Choose a reason for hiding this comment

nellshamrell Mar 20, 2020

Choose a reason for hiding this comment

vtbassmatt Mar 20, 2020

Choose a reason for hiding this comment

nellshamrell commented Mar 23, 2020

nellshamrell commented Mar 23, 2020

bors commented Mar 23, 2020

bors commented Mar 24, 2020

Centril commented Mar 24, 2020

bors commented Mar 24, 2020

bors commented Mar 24, 2020

nellshamrell Mar 12, 2020 •

edited

Loading

nellshamrell commented Mar 18, 2020 •

edited

Loading