Skip to content

Uncomments out a reproducible build test #105075

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.

Sign up for GitHub

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

Closed
wants to merge 10 commits into from
Closed

Uncomments out a reproducible build test #105075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64f795b
Uncomments out a reproducible build test
nellshamrell Nov 29, 2022
fd4d39b
wip
nellshamrell Nov 29, 2022
a1bcbd2
activates tests on msvc builders on CI
nellshamrell Dec 1, 2022
0b735fe
resolve conflict
nellshamrell Dec 1, 2022
f5a811f
fix ci
nellshamrell Dec 1, 2022
b7b0dad
actually run the thing I am supposed to
nellshamrell Dec 1, 2022
d388db5
just run msvc builds for now
nellshamrell Dec 2, 2022
2a6ef1c
fix ci
nellshamrell Dec 2, 2022
1f6a54c
use different linker flags when running on windows
nellshamrell Dec 2, 2022
91d6afc
only run one set of msvc tests
nellshamrell Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,11 @@ jobs:
strategy:
matrix:
include:
- 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
- name: x86_64-msvc-2
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
os: ubuntu-20.04-xl
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
SCRIPT: make ci-subset-2
os: windows-latest-xl
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
13 changes: 4 additions & 9 deletions src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,11 @@ jobs:
strategy:
matrix:
include:
- name: mingw-check
<<: *job-linux-xl

- name: x86_64-gnu-llvm-13
<<: *job-linux-xl

- name: x86_64-gnu-tools
- name: x86_64-msvc-2
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
<<: *job-linux-xl
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
SCRIPT: make ci-subset-2
<<: *job-windows-xl

auto:
permissions:
Expand Down
16 changes: 9 additions & 7 deletions src/test/run-make-fulldeps/reproducible-build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -12,14 +16,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
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To Do: Create a separate issue for this

#
# different_source_dirs_bin \
# remap_cwd_bin \

smoke:
Expand Down Expand Up @@ -67,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:
Expand Down