Skip to content

Commit

Permalink
[SOFT-499] Upgrade CI to Ubuntu 18.04 (#413)
Browse files Browse the repository at this point in the history
GitHub Actions phases out Ubuntu 16.04 at midnight, so we're upgrading less than half an hour before the deadline.
  • Loading branch information
abdullahs26 authored Sep 20, 2021
1 parent cafeabe commit 1f6e6c6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
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

0 comments on commit 1f6e6c6

Please sign in to comment.