Skip to content
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.

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

Upgrade DBC releaser script from ubuntu-16.04 #477

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f6adc04
changed ubuntu 16.04 to ubuntu 20.04
abdullahs26 Jul 5, 2021
f7de7b3
changed to 16.04
abdullahs26 Jul 7, 2021
d21c8cf
changed to ubuntu 20.04
abdullahs26 Jul 7, 2021
f9ab238
changed gcc-6 to gcc-9
abdullahs26 Jul 14, 2021
86ace13
changed clang version
abdullahs26 Jul 21, 2021
36a7963
changed to clang-10
abdullahs26 Jul 21, 2021
720dbae
changed the install make to use sudo apt-get install
abdullahs26 Aug 28, 2021
0c24099
changed install python tooling to sudo-apt install
abdullahs26 Sep 15, 2021
6d8b870
added back make install_requirements
abdullahs26 Sep 15, 2021
afdded7
chaned python3 to python
abdullahs26 Sep 15, 2021
159b0e5
changed python tooling
abdullahs26 Sep 15, 2021
a029eb2
change back python tooling:
abdullahs26 Sep 15, 2021
2f37524
changed python tooling
abdullahs26 Sep 16, 2021
0e17b66
added back make install_requirements
abdullahs26 Sep 19, 2021
a16d32d
changed makefile
abdullahs26 Sep 20, 2021
8840ebf
chaned makefile and make/filter.mk
abdullahs26 Sep 20, 2021
0713974
Merge branch 'master' into soft_499_upgrade_ci_from_ubuntu
abdullahs26 Sep 20, 2021
e022fb7
[SOFT-499] added back install lcov
abdullahs26 Sep 20, 2021
1e14e35
[SOFT-499] added back python packages
abdullahs26 Sep 20, 2021
ae62c35
[SOFT-499] changed clang format version back to 5 and changed to ubun…
abdullahs26 Sep 20, 2021
d474d43
[SOFT-499] added back actions/setup-python@v2
abdullahs26 Sep 20, 2021
b4ed37f
[SOFT-499] changed install make
abdullahs26 Sep 20, 2021
ca76aa8
[SOFT-499] deleted line
abdullahs26 Sep 20, 2021
b658fb7
[SOFT-499] deleted blank lines and added comment in Makefile
abdullahs26 Sep 20, 2021
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
20 changes: 3 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:

jobs:
build:
runs-on: ubuntu-16.04
runs-on: ubuntu-18.04
timeout-minutes: 12
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -55,21 +55,6 @@ jobs:
tar -xjf $GCC_ARCHIVE_PATH
echo "${HOME}/${GCC_PATH}/bin" >> $GITHUB_PATH

- name: Install GNU Make 4.1
env:
MAKE_PATH: make-4.1
MAKE_ARCHIVE_PATH: make-4.1.tar.gz
MAKE_URL: http://ftp.gnu.org/gnu/make/make-4.1.tar.gz
run: |
wget -nv $MAKE_URL
tar xvf $MAKE_ARCHIVE_PATH
cd $MAKE_PATH
./configure --prefix=${HOME}/.local
make
make install
cd ..
rm -rf $MAKE_PATH

- uses: actions/setup-python@v2
with:
python-version: '3.x'
Expand All @@ -79,7 +64,8 @@ jobs:
pip install --user virtualenv
pip install --upgrade pip
pip install --upgrade setuptools
make install_requirements
sudo apt install python3-testresources
make install_requirements_ci

- name: Force PATH to update
run: hash -r
Expand Down
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,18 @@ codecov:
lcov -r coverage.info $(IGNORE_CODECOV_FILES) -o coverage.info && \
genhtml coverage.info --output-directory ../../../$(CODECOV_DIR) --legend --show-details

# Required for CI to build successfully
.PHONY: install_requirements_ci
install_requirements_ci:
@sudo apt-get install lcov -y
@sudo apt-get update
@sudo apt-get install protobuf-compiler
@rm -rf $(VENV_DIR)
@mkdir $(VENV_DIR)
@virtualenv $(VENV_DIR)
@. $(VENV_DIR)/bin/activate; \
pip install -r requirements.txt

MU_PROJS :=
-include $(MU_DIR)/integration_tests/deps.mk

Expand Down
2 changes: 1 addition & 1 deletion make/filter.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ VALID_LIBRARIES := $(patsubst $(LIB_DIR)/%/rules.mk,%,$(wildcard $(LIB_DIR)/*/ru
# - For test, gdb, and program, check to see if PLATFORM and {PROJECT or {LIBRARY and TEST}} are valid
# - For build, check if PLATFORM and {PROJECT or LIBRARY} are valid

ifneq (,$(filter clean lint lint_quick pylint format format_quick build_all test_all codecov test_format socketcan codegen codegen_dbc codegen_protos codegen_test mock_can_data babydriver bootloader_protos install_mu mu fastmu pylint_quick pyformat pyformat_quick pytest_all pytest install_requirements,$(MAKECMDGOALS)))
ifneq (,$(filter clean lint lint_quick pylint format format_quick build_all test_all codecov test_format socketcan codegen codegen_dbc codegen_protos codegen_test mock_can_data babydriver bootloader_protos install_mu mu fastmu pylint_quick pyformat pyformat_quick pytest_all pytest install_requirements install_requirements_ci,$(MAKECMDGOALS)))
# Universal operation: do nothing - args are not used or only PLATFORM is checked
else ifneq (,$(filter new,$(MAKECMDGOALS)))
# New project: just make sure PROJECT or LIBRARY is defined
Expand Down