Skip to content

Commit

Permalink
Github Actions - Take <i-dont-know> getting tests to work
Browse files Browse the repository at this point in the history
  • Loading branch information
thepowersgang committed Oct 17, 2021
1 parent 92528c7 commit d73f77b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,16 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: avoid recompile
run: make --touch && make --touch -C tools/minicargo && make --touch -C tools/testrunner
- name: Download all workflow run artifacts
uses: actions/download-artifact@v2
with:
name: binaries
path: bin
- name: make RUSTCSRC
run: make RUSTCSRC
- name: avoid recompile
- name: avoid recompile 2
run: make --touch && make --touch -C tools/minicargo && make --touch -C tools/testrunner
- name: make test
run: make test
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ output$(OUTDIR_SUF)/rust/test_run-pass_hello_out.txt: output$(OUTDIR_SUF)/rust/t
# Compile rules for mrustc itself
# -------------------------------
bin/mrustc.a: $(filter-out $(OBJDIR)main.o, $(OBJ))
@mkdir -p $(dir $@)
@+mkdir -p $(dir $@)
@echo [AR] -o $@
ifeq ($(shell uname -s || echo not),Darwin)
# We can use llvm-ar for having rcD available on Darwin.
Expand All @@ -300,7 +300,7 @@ else
endif

$(BIN): $(OBJDIR)main.o bin/mrustc.a bin/common_lib.a
@mkdir -p $(dir $@)
@+mkdir -p $(dir $@)
@echo [CXX] -o $@
ifeq ($(OS),Windows_NT)
else ifeq ($(shell uname -s || echo not),Darwin)
Expand Down

0 comments on commit d73f77b

Please sign in to comment.