From 64f795b3fe8ccb08adb1de5c8b5286c157c5fcff Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Tue, 29 Nov 2022 19:24:57 +0000 Subject: [PATCH 01/10] Uncomments out a reproducible build test that appears to now be working on Windows. Signed-off-by: Nell Shamrell --- src/test/run-make-fulldeps/reproducible-build/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile index 642a480815b7b..aa1e7419822e3 100644 --- a/src/test/run-make-fulldeps/reproducible-build/Makefile +++ b/src/test/run-make-fulldeps/reproducible-build/Makefile @@ -12,14 +12,11 @@ all: \ different_source_dirs_rlib \ remap_cwd_rlib \ remap_cwd_to_empty \ + different_source_dirs_bin \ extern_flags -# TODO: Builds of `bin` crate types are not deterministic with debuginfo=2 on -# Windows. -# See: https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533 -# Issue: https://github.com/rust-lang/rust/issues/88982 +# This test appears to not be working on either Linux or Windows # -# different_source_dirs_bin \ # remap_cwd_bin \ smoke: From fd4d39bed53e928c2aa86d17fc50167046faaafd Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Tue, 29 Nov 2022 19:24:57 +0000 Subject: [PATCH 02/10] wip --- src/test/run-make-fulldeps/reproducible-build/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile index aa1e7419822e3..560a3f83bb9c5 100644 --- a/src/test/run-make-fulldeps/reproducible-build/Makefile +++ b/src/test/run-make-fulldeps/reproducible-build/Makefile @@ -15,7 +15,16 @@ all: \ different_source_dirs_bin \ extern_flags +<<<<<<< HEAD # This test appears to not be working on either Linux or Windows +======= +# TODO: Builds of `bin` crate types are not deterministic with debuginfo=2 on +# Windows. +# See: https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533 +# Issue: https://github.com/rust-lang/rust/issues/88982 + +# NOTE - not working on Linux either +>>>>>>> 925c2b13e42 (wip) # # remap_cwd_bin \ From a1bcbd278b6eab6e000e86ea97d08398e655e2d6 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Thu, 1 Dec 2022 19:04:40 +0000 Subject: [PATCH 03/10] activates tests on msvc builders on CI --- src/ci/github-actions/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 9f40177990080..ca31e377fa38a 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -286,6 +286,12 @@ jobs: strategy: matrix: include: + - name: x86_64-msvc-1 + <<: *job-windows-xl + + - name: x86_64-msvc-2 + <<: *job-windows-xl + - name: mingw-check <<: *job-linux-xl From 0b735fe64e4a0297a5b86863d0efb5378b176d08 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Thu, 1 Dec 2022 19:06:57 +0000 Subject: [PATCH 04/10] resolve conflict --- src/test/run-make-fulldeps/reproducible-build/Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile index 560a3f83bb9c5..aa1e7419822e3 100644 --- a/src/test/run-make-fulldeps/reproducible-build/Makefile +++ b/src/test/run-make-fulldeps/reproducible-build/Makefile @@ -15,16 +15,7 @@ all: \ different_source_dirs_bin \ extern_flags -<<<<<<< HEAD # This test appears to not be working on either Linux or Windows -======= -# TODO: Builds of `bin` crate types are not deterministic with debuginfo=2 on -# Windows. -# See: https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533 -# Issue: https://github.com/rust-lang/rust/issues/88982 - -# NOTE - not working on Linux either ->>>>>>> 925c2b13e42 (wip) # # remap_cwd_bin \ From f5a811f31e298d6e612d421bbe99cfe2beea4731 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Thu, 1 Dec 2022 19:09:44 +0000 Subject: [PATCH 05/10] fix ci --- src/ci/github-actions/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index ca31e377fa38a..ede8029954982 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -287,10 +287,16 @@ jobs: matrix: include: - name: x86_64-msvc-1 - <<: *job-windows-xl + env: + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-subset-1 + <<: *job-windows-xl - name: x86_64-msvc-2 - <<: *job-windows-xl + env: + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-subset-2 + <<: *job-windows-xl - name: mingw-check <<: *job-linux-xl From b7b0dad3d6868531f42c673a416eafa5553c4382 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Thu, 1 Dec 2022 19:19:35 +0000 Subject: [PATCH 06/10] actually run the thing I am supposed to --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 771cef6e4d0d6..56d973b8bead0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,16 @@ jobs: strategy: matrix: include: + - name: x86_64-msvc-1 + env: + RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" + SCRIPT: make ci-subset-1 + os: windows-latest-xl + - name: x86_64-msvc-2 + env: + RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" + SCRIPT: make ci-subset-2 + os: windows-latest-xl - name: mingw-check os: ubuntu-20.04-xl env: {} From d388db55e17abe2613168abba9d92c610c593672 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Fri, 2 Dec 2022 21:00:58 +0000 Subject: [PATCH 07/10] just run msvc builds for now --- src/ci/github-actions/ci.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index ede8029954982..7e4c3328431ce 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -298,17 +298,6 @@ jobs: SCRIPT: make ci-subset-2 <<: *job-windows-xl - - name: mingw-check - <<: *job-linux-xl - - - name: x86_64-gnu-llvm-13 - <<: *job-linux-xl - - - name: x86_64-gnu-tools - env: - CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 - <<: *job-linux-xl - auto: permissions: actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds From 2a6ef1cb7cc82ec89c2acb09bbb9be81d8fb4aa2 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Fri, 2 Dec 2022 21:12:23 +0000 Subject: [PATCH 08/10] fix ci --- .github/workflows/ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56d973b8bead0..53fba80d8bf27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,16 +54,6 @@ jobs: RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" SCRIPT: make ci-subset-2 os: windows-latest-xl - - name: mingw-check - os: ubuntu-20.04-xl - env: {} - - name: x86_64-gnu-llvm-13 - os: ubuntu-20.04-xl - env: {} - - name: x86_64-gnu-tools - env: - CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 - os: ubuntu-20.04-xl timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: From 1f6a54c30a2498a18608f04331445cd4ae5c1d4c Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Fri, 2 Dec 2022 22:24:44 +0000 Subject: [PATCH 09/10] use different linker flags when running on windows --- src/test/run-make-fulldeps/reproducible-build/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile index aa1e7419822e3..0ed47708dd671 100644 --- a/src/test/run-make-fulldeps/reproducible-build/Makefile +++ b/src/test/run-make-fulldeps/reproducible-build/Makefile @@ -1,5 +1,9 @@ include ../tools.mk +ifdef IS_WINDOWS + REPRO_LINKER_FLAGS=-Clink-arg=/experimental:deterministic +endif + # ignore-musl # Objects are reproducible but their path is not. @@ -64,11 +68,12 @@ different_source_dirs_bin: $(RUSTC) reproducible-build-aux.rs mkdir $(TMPDIR)/test cp reproducible-build.rs $(TMPDIR)/test - $(RUSTC) reproducible-build.rs --crate-type bin --remap-path-prefix=$$PWD=/b + $(RUSTC) reproducible-build.rs --crate-type bin --remap-path-prefix=$$PWD=/b $(REPRO_LINKER_FLAGS) cp $(TMPDIR)/reproducible-build $(TMPDIR)/foo (cd $(TMPDIR)/test && $(RUSTC) reproducible-build.rs \ --remap-path-prefix=$(TMPDIR)/test=/b \ - --crate-type bin) + --crate-type bin \ + $(REPRO_LINKER_FLAGS)) cmp "$(TMPDIR)/reproducible-build" "$(TMPDIR)/foo" || exit 1 different_source_dirs_rlib: From 91d6afc35b7ed04920d18e3e131aa53f67b558a3 Mon Sep 17 00:00:00 2001 From: Nell Shamrell-Harrington Date: Fri, 2 Dec 2022 15:37:25 -0800 Subject: [PATCH 10/10] only run one set of msvc tests --- .github/workflows/ci.yml | 5 ----- src/ci/github-actions/ci.yml | 6 ------ 2 files changed, 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53fba80d8bf27..ac7d8429e2ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,11 +44,6 @@ jobs: strategy: matrix: include: - - name: x86_64-msvc-1 - env: - RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" - SCRIPT: make ci-subset-1 - os: windows-latest-xl - name: x86_64-msvc-2 env: RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 7e4c3328431ce..9eea2f89cbb1a 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -286,12 +286,6 @@ jobs: strategy: matrix: include: - - name: x86_64-msvc-1 - env: - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-subset-1 - <<: *job-windows-xl - - name: x86_64-msvc-2 env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler