Skip to content

Commit

Permalink
ci: various...
Browse files Browse the repository at this point in the history
  • Loading branch information
NikLeberg committed Dec 19, 2023
1 parent 2b80eaf commit c46b510
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,3 @@ jobs:
sw/main.elf
sw/neorv32_exe.bin
build/output_files/*.sof
- name: Setup tmate session
if: failure()
uses: mxschmitt/action-tmate@v3
with:
sudo: false
1 change: 0 additions & 1 deletion scripts/dep_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,5 +243,4 @@ def _is_refering_to(self, u, v):
vhdl_parser.remove(["ieee", "std"])
vhdl_parser.resolve()

vhdl_parser.deps_to_dot()
vhdl_parser.write_makefile_rules()
8 changes: 4 additions & 4 deletions scripts/makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ include $(PROJ_ROOT)/scripts/makefile.def

$(info Running main Makefile.)

# Define bash as the shell to use for sub-shells. The flag --rcfile is set to
# the .env file containing aliases of commands for running in docker containers.
SHELL = /bin/bash
.SHELLFLAGS = --rcfile ../.devcontainer/.env -ic
# Define bash as the shell to use for sub-shells. The environment variable
# $BASH_ENV points to the .env file containing aliases of commands for running
# in docker containers. These aliases can then be used in recipies.
SHELL = BASH_ENV=../.devcontainer/.env /bin/bash

# Helper variables.
tab := $(shell echo -e "\t")
Expand Down
9 changes: 4 additions & 5 deletions sw/makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Define bash as the shell to use for sub-shells. The flag --rcfile is set to
# the .env file containing aliases of commands for running in docker containers.
SHELL = BASH_ENV=../.devcontainer/.env /bin/bash
.SHELLFLAGS = --rcfile ../.devcontainer/.env -lc
# Define bash as the shell to use for sub-shells. The environment variable
# $BASH_ENV points to the .env file containing aliases of commands for running
# in docker containers. These aliases can then be used in recipies.
SHELL = BASH_ENV=../.devcontainer/.env /bin/bash

# Forward goals to sub-make.
%:
env
@riscv_make -f makefile.sw $@ CLI_FLAGS=$(CLI_FLAGS)

0 comments on commit c46b510

Please sign in to comment.