From 7c9bca7c279efa286015d5dcc0ba45da548d5415 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 14 Mar 2021 01:15:25 +0000 Subject: [PATCH 01/68] initial commit --- .github/workflows/main.yml | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08017cafe..df6c0019d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,16 +19,21 @@ jobs: steps: - uses: actions/checkout@v2 - # TODO: cache all the setup - - name: Setup directories run: | # create directory that will be on the PATH mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> $GITHUB_PATH mkdir -p ~/source + + - uses: actions/cache@v2 + id: cache + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - name: Install gcc, clang, clang-format + if: steps.cache.outputs.cache-hit != 'true' run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update @@ -51,6 +56,7 @@ jobs: 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 + if: steps.cache.outputs.cache-hit != 'true' run: | wget -nv $MAKE_URL tar xvf $MAKE_ARCHIVE_PATH @@ -66,6 +72,7 @@ jobs: python-version: '3.x' - name: Install Python tooling + if: steps.cache.outputs.cache-hit != 'true' run: | pip install --user pylint pip install --user autopep8 @@ -90,17 +97,34 @@ jobs: pylint --version autopep8 --version - - name: Format and lint + - name: Format run: | make test_format + + - name: Lint make lint + + - name: Pylint make pylint - - name: Build and test + - name: Build stm32f0xx run: | make build_all PLATFORM=stm32f0xx DEFINES="${DEFINES}" make clean + + - name: Build x86 + run: | make build_all PLATFORM=x86 DEFINE="${DEFINES}" make test_all PLATFORM=x86 DEFINE="${DEFINES}" + + - name: Test x86 + run: | + make test_all PLATFORM=x86 DEFINE="${DEFINES}" + + - name: Pytest + run: | make pytest_all - make build_all PLATFORM=x86 COMPILER=clang DEFINE="${DEFINES}" + + - name: Build x86 with clang + run: | + make build_all PLATFORM=x86 COMPILER=clang DEFINE="${DEFINES}" \ No newline at end of file From 7953f8cf0de95746fc5a5f812934ba9aeac43dd2 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 18 Mar 2021 02:38:54 +0000 Subject: [PATCH 02/68] more cache steps, removed duplicate line, updated readme --- .github/workflows/main.yml | 70 +++++++++++++++++++++++++++++++------- README.md | 2 +- 2 files changed, 59 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index df6c0019d..5dc11b17f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,24 +25,71 @@ jobs: mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> $GITHUB_PATH mkdir -p ~/source + + - uses: actions/cache@v2 + id: cache-gcc + with: + path: ~/.local/bin/gcc + key: ${{ runner.os }}-gcc + + - uses: actions/cache@v2 + id: cache-clang + with: + path: ~/.cache/pip + key: ${{ runner.os }}-clang - uses: actions/cache@v2 - id: cache + id: cache-clang-format + with: + path: ~/.cache/pip + key: ${{ runner.os }}-clang-format + + - uses: actions/cache@v2 + id: cache-libc6-i386 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-libc6-i386 + + - uses: actions/cache@v2 + id: cache-linux-module + with: + path: ~/.cache/pip + key: ${{ runner.os }}-linux-module + + - uses: actions/cache@v2 + id: cache-make + with: + path: ~/.cache/pip + key: ${{ runner.os }}-make + + - uses: actions/cache@v2 + id: cache-pip with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - name: Install gcc, clang, clang-format - if: steps.cache.outputs.cache-hit != 'true' run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-fast -y install gcc-6 - sudo apt-fast -y install clang-5.0 - sudo apt-fast -y install clang-format-5.0 - sudo apt-fast -y install libc6-i386 - # for vcan module - sudo apt-fast -y install linux-modules-extra-$(uname -r) + + if: steps.cache-gcc.outputs.cache-hit != 'true' + run: sudo apt-fast -y install gcc-6 + + if: steps.cache-clang.outputs.cache-hit != 'true' + run: sudo apt-fast -y install clang-5.0 + + if: steps.cache-clang-format.outputs.cache-hit != 'true' + run: sudo apt-fast -y install clang-format-5.0 + + if: steps.cache-libc6-i386.outputs.cache-hit != 'true' + run: sudo apt-fast -y install libc6-i386 + + # for vcan module + if: steps.cache-linux-module.outputs.cache-hit != 'true' + run: sudo apt-fast -y install linux-modules-extra-$(uname -r) + + run: | ln -sf `which gcc-6` ~/.local/bin/gcc ln -sf `which clang-5.0` ~/.local/bin/clang ln -sf `which clang-format-5.0` ~/.local/bin/clang-format @@ -56,7 +103,7 @@ jobs: 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 - if: steps.cache.outputs.cache-hit != 'true' + if: steps.cache-make.outputs.cache-hit != 'true' run: | wget -nv $MAKE_URL tar xvf $MAKE_ARCHIVE_PATH @@ -72,7 +119,7 @@ jobs: python-version: '3.x' - name: Install Python tooling - if: steps.cache.outputs.cache-hit != 'true' + if: steps.cache-pip.outputs.cache-hit != 'true' run: | pip install --user pylint pip install --user autopep8 @@ -115,7 +162,6 @@ jobs: - name: Build x86 run: | make build_all PLATFORM=x86 DEFINE="${DEFINES}" - make test_all PLATFORM=x86 DEFINE="${DEFINES}" - name: Test x86 run: | @@ -127,4 +173,4 @@ jobs: - name: Build x86 with clang run: | - make build_all PLATFORM=x86 COMPILER=clang DEFINE="${DEFINES}" \ No newline at end of file + make build_all PLATFORM=x86 COMPILER=clang DEFINE="${DEFINES}" diff --git a/README.md b/README.md index 8151b8589..c984dfa0e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # firmware_xiv -[![Build Status](https://travis-ci.com/uw-midsun/firmware_xiv.svg?branch=master)](https://travis-ci.com/uw-midsun/firmware_xiv) +[![Build Status](https://github.com/uw-midsun/firmware_xiv/actions.svg?branch=master)](https://github.com/uw-midsun/firmware_xiv/actions) This repository contains all firmware for the [University of Waterloo](https://uwaterloo.ca/)'s [Midnight Sun Solar Rayce Car](http://www.uwmidsun.com/) team's 14th car. From ad66a51efa26e3257bee295cd22571e10c5ad8d1 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 20 Mar 2021 00:38:56 +0000 Subject: [PATCH 03/68] individualized if statements into steps, updated installation paths, added arm cache --- .github/workflows/main.yml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5dc11b17f..b3715b2a5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,37 +29,37 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: ~/.local/bin/gcc + path: /var/cache/apt/apt-fast/gcc-6_6.5.0-2ubuntu1~16.04_amd64.deb key: ${{ runner.os }}-gcc - uses: actions/cache@v2 id: cache-clang with: - path: ~/.cache/pip + path: /var/cache/apt/apt-fast/clang-5.0_1%3a5.0-3~16.04.1_amd64.deb key: ${{ runner.os }}-clang - uses: actions/cache@v2 id: cache-clang-format with: - path: ~/.cache/pip + path: /var/cache/apt/apt-fast/clang-format-5.0_1%3a5.0-3~16.04.1_amd64.deb key: ${{ runner.os }}-clang-format - uses: actions/cache@v2 id: cache-libc6-i386 with: - path: ~/.cache/pip + path: /var/cache/apt/archives/libc6-i386_2.27-3ubuntu1_amd64.deb key: ${{ runner.os }}-libc6-i386 - uses: actions/cache@v2 id: cache-linux-module with: - path: ~/.cache/pip + path: /var/cache/apt/apt-fast/linux-modules-extra-4.15.0-1108-azure_4.15.0-1108.120~16.04.1_amd64.deb key: ${{ runner.os }}-linux-module - uses: actions/cache@v2 id: cache-make with: - path: ~/.cache/pip + path: /home/runner/work/firmware_xiv/firmware_xiv/make-4.1 key: ${{ runner.os }}-make - uses: actions/cache@v2 @@ -68,33 +68,46 @@ jobs: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - - name: Install gcc, clang, clang-format + - uses: actions/cache@v2 + id: cache-arm + with: + path: /tmp/tmp-13551GHF3OobAX4iW/gcc-6-2017-q2/bin + key: ${{ runner.os }}-arm + + - name: Add repo and update run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - + + - name: Install gcc if: steps.cache-gcc.outputs.cache-hit != 'true' run: sudo apt-fast -y install gcc-6 + - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' run: sudo apt-fast -y install clang-5.0 + - name: Install clang-format if: steps.cache-clang-format.outputs.cache-hit != 'true' run: sudo apt-fast -y install clang-format-5.0 + - name: Install libc6-i386 if: steps.cache-libc6-i386.outputs.cache-hit != 'true' run: sudo apt-fast -y install libc6-i386 # for vcan module + - name: Install linux modules if: steps.cache-linux-module.outputs.cache-hit != 'true' run: sudo apt-fast -y install linux-modules-extra-$(uname -r) + - name: Which gcc, clang, clang-format run: | ln -sf `which gcc-6` ~/.local/bin/gcc ln -sf `which clang-5.0` ~/.local/bin/clang ln -sf `which clang-format-5.0` ~/.local/bin/clang-format - - - uses: fiam/arm-none-eabi-gcc@v1 + + - if: steps.cache-arm.outputs.cache-hit != 'true' + uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' From a7ffe57376abeed481aab450110fdaa939f7c77a Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 20 Mar 2021 00:43:45 +0000 Subject: [PATCH 04/68] added missing run statements and changed their formatting --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3715b2a5..17a9d4880 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -162,9 +162,11 @@ jobs: make test_format - name: Lint + run: make lint - name: Pylint + run: make pylint - name: Build stm32f0xx From c381297b89de9cc68c338a49e7e787170f5da864 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 26 Mar 2021 02:45:45 +0000 Subject: [PATCH 05/68] updated cache dir for arm --- .github/workflows/main.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17a9d4880..beb092a8d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,7 +71,7 @@ jobs: - uses: actions/cache@v2 id: cache-arm with: - path: /tmp/tmp-13551GHF3OobAX4iW/gcc-6-2017-q2/bin + path: ~/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm - name: Add repo and update @@ -110,6 +110,7 @@ jobs: uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' + directory: ~/.arm-none-eabi-gcc-cache - name: Install GNU Make 4.1 env: @@ -158,16 +159,13 @@ jobs: autopep8 --version - name: Format - run: | - make test_format + run: make test_format - name: Lint - run: - make lint + run: make lint - name: Pylint - run: - make pylint + run: make pylint - name: Build stm32f0xx run: | @@ -175,17 +173,13 @@ jobs: make clean - name: Build x86 - run: | - make build_all PLATFORM=x86 DEFINE="${DEFINES}" + run: make build_all PLATFORM=x86 DEFINE="${DEFINES}" - name: Test x86 - run: | - make test_all PLATFORM=x86 DEFINE="${DEFINES}" + run: make test_all PLATFORM=x86 DEFINE="${DEFINES}" - name: Pytest - run: | - make pytest_all + run: make pytest_all - name: Build x86 with clang - run: | - make build_all PLATFORM=x86 COMPILER=clang DEFINE="${DEFINES}" + run: make build_all PLATFORM=x86 COMPILER=clang DEFINE="${DEFINES}" From 1761e2e38c40f4b8bd07b477ea3ed95cade0f1e5 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 26 Mar 2021 02:50:16 +0000 Subject: [PATCH 06/68] added mkdir --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index beb092a8d..de313749e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -106,6 +106,10 @@ jobs: ln -sf `which clang-5.0` ~/.local/bin/clang ln -sf `which clang-format-5.0` ~/.local/bin/clang-format + - name: Make arm cache directory + run: + mkdir -p ~/source + - if: steps.cache-arm.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: From 375324ce34de65f3ace304376d6474d6d8f25ff9 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 26 Mar 2021 03:53:00 +0000 Subject: [PATCH 07/68] trying out mkdir again --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de313749e..8837bc78a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,7 +108,7 @@ jobs: - name: Make arm cache directory run: - mkdir -p ~/source + mkdir -p ~/.arm-none-eabi-gcc-cache - if: steps.cache-arm.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 From dcee98032658686a741eed58c51ee9ea4670bc68 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 27 Mar 2021 17:03:55 +0000 Subject: [PATCH 08/68] changed cache to v1 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8837bc78a..88cad1afa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,7 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 - id: cache-arm + id: cache-arm-v1 with: path: ~/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm @@ -110,7 +110,7 @@ jobs: run: mkdir -p ~/.arm-none-eabi-gcc-cache - - if: steps.cache-arm.outputs.cache-hit != 'true' + - if: steps.cache-arm-v1.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' From 4429f14482d51f486793c2044620d4cdfceace6b Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 27 Mar 2021 18:30:00 +0000 Subject: [PATCH 09/68] changed the id revision to key --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88cad1afa..39013f507 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,10 +69,10 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 - id: cache-arm-v1 + id: cache-arm with: path: ~/.arm-none-eabi-gcc-cache - key: ${{ runner.os }}-arm + key: ${{ runner.os }}-arm-v1 - name: Add repo and update run: | @@ -110,7 +110,7 @@ jobs: run: mkdir -p ~/.arm-none-eabi-gcc-cache - - if: steps.cache-arm-v1.outputs.cache-hit != 'true' + - if: steps.cache-arm.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' From 88a1d4cd0b5b7642ffcec7fec95a9c97eeb91413 Mon Sep 17 00:00:00 2001 From: Kevin Lee Date: Tue, 30 Mar 2021 12:30:32 -0400 Subject: [PATCH 10/68] replaced ~ with /home/runner, removed force step --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 39013f507..fd688b5f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,7 +71,7 @@ jobs: - uses: actions/cache@v2 id: cache-arm with: - path: ~/.arm-none-eabi-gcc-cache + path: /home/runner/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm-v1 - name: Add repo and update @@ -144,9 +144,6 @@ jobs: # Install dependencies from all requirements.txt in the repo make install_requirements - - name: Force PATH to update - run: hash -r - - name: Print versions of everything run: | arm-none-eabi-gcc --version From 520e6e1445c5e492520edec60967b5f7359654da Mon Sep 17 00:00:00 2001 From: Kevin Lee Date: Tue, 30 Mar 2021 12:42:23 -0400 Subject: [PATCH 11/68] forgot to change ~ to home for installation --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd688b5f6..16678965c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,7 +114,7 @@ jobs: uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' - directory: ~/.arm-none-eabi-gcc-cache + directory: /home/runner/.arm-none-eabi-gcc-cache - name: Install GNU Make 4.1 env: From 00e27219bf5d7db1318b7a0f40da835752778a49 Mon Sep 17 00:00:00 2001 From: Kevin Lee Date: Tue, 30 Mar 2021 12:45:50 -0400 Subject: [PATCH 12/68] trying out homerunner for pip --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16678965c..d078872f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,7 +65,7 @@ jobs: - uses: actions/cache@v2 id: cache-pip with: - path: ~/.cache/pip + path: /home/runner/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 @@ -108,7 +108,7 @@ jobs: - name: Make arm cache directory run: - mkdir -p ~/.arm-none-eabi-gcc-cache + mkdir -p /home/runner/.arm-none-eabi-gcc-cache - if: steps.cache-arm.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 From 7da46e81f97c94491011bd54b6f326b9b717fe77 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 30 Mar 2021 19:13:38 +0000 Subject: [PATCH 13/68] renamed arm cache and formatted --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d078872f8..9d660d68d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,7 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 - id: cache-arm + id: cache-arm-v1 with: path: /home/runner/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm-v1 @@ -110,7 +110,7 @@ jobs: run: mkdir -p /home/runner/.arm-none-eabi-gcc-cache - - if: steps.cache-arm.outputs.cache-hit != 'true' + - if: steps.cache-arm-v1.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' From 4c7b30e70c310aa6bacce9b60129fb955944ed1e Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 1 Apr 2021 00:55:41 +0000 Subject: [PATCH 14/68] trying out new cache paths --- .github/workflows/main.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d660d68d..3f9b3a868 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,32 +29,46 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: /var/cache/apt/apt-fast/gcc-6_6.5.0-2ubuntu1~16.04_amd64.deb + path: /usr/bin/gcc # might not find gcc-6 key: ${{ runner.os }}-gcc - uses: actions/cache@v2 id: cache-clang with: - path: /var/cache/apt/apt-fast/clang-5.0_1%3a5.0-3~16.04.1_amd64.deb + path: /usr/bin/clang-5.0 key: ${{ runner.os }}-clang - uses: actions/cache@v2 id: cache-clang-format with: - path: /var/cache/apt/apt-fast/clang-format-5.0_1%3a5.0-3~16.04.1_amd64.deb + path: /usr/bin/clang-format-5.0 key: ${{ runner.os }}-clang-format - uses: actions/cache@v2 id: cache-libc6-i386 with: - path: /var/cache/apt/archives/libc6-i386_2.27-3ubuntu1_amd64.deb + path: /usr/share/doc/libc6-i386 key: ${{ runner.os }}-libc6-i386 + # /usr/share/doc/libc6-i386 + # /usr/share/lintian/overrides/libc6-i386 + + # /var/lib/dpkg/info/libc6-i386.shlibs + # /var/lib/dpkg/info/libc6-i386.triggers + # /var/lib/dpkg/info/libc6-i386.conffiles + # /var/lib/dpkg/info/libc6-i386.postrm + # /var/lib/dpkg/info/libc6-i386.list + # /var/lib/dpkg/info/libc6-i386.md5sums + # /var/lib/dpkg/info/libc6-i386.symbols - uses: actions/cache@v2 id: cache-linux-module with: - path: /var/cache/apt/apt-fast/linux-modules-extra-4.15.0-1108-azure_4.15.0-1108.120~16.04.1_amd64.deb + path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic key: ${{ runner.os }}-linux-module + # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postinst + # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postrm + # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.list + # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.md5sums - uses: actions/cache@v2 id: cache-make From 32c20fde0ddb56a45b13e38881f87ad49796064c Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 2 Apr 2021 00:55:48 +0000 Subject: [PATCH 15/68] changed libc6 path --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f9b3a868..f0b4d45ee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: - uses: actions/cache@v2 id: cache-libc6-i386 with: - path: /usr/share/doc/libc6-i386 + path: /var/lib/dpkg/info/libc6-i386 key: ${{ runner.os }}-libc6-i386 # /usr/share/doc/libc6-i386 # /usr/share/lintian/overrides/libc6-i386 From 73a54ce9d4f8a8c2abed68a842a4b2d31bbda8a0 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 2 Apr 2021 01:54:46 +0000 Subject: [PATCH 16/68] checking if deb solves test_barrier --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f0b4d45ee..4652fe46d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: - uses: actions/cache@v2 id: cache-libc6-i386 with: - path: /var/lib/dpkg/info/libc6-i386 + path: /var/cache/apt/archives/libc6-i386_2.27-3ubuntu1_amd64.deb key: ${{ runner.os }}-libc6-i386 # /usr/share/doc/libc6-i386 # /usr/share/lintian/overrides/libc6-i386 @@ -63,7 +63,7 @@ jobs: - uses: actions/cache@v2 id: cache-linux-module with: - path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic + path: /var/cache/apt/apt-fast/linux-modules-extra-4.15.0-1108-azure_4.15.0-1108.120~16.04.1_amd64.deb key: ${{ runner.os }}-linux-module # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postinst # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postrm From 623178ef1e7ee3b935f281eb8e971362004d3f87 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 2 Apr 2021 02:06:00 +0000 Subject: [PATCH 17/68] trying out lintian --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4652fe46d..3c1511564 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: /usr/bin/gcc # might not find gcc-6 + path: /usr/bin/gcc key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -47,7 +47,7 @@ jobs: - uses: actions/cache@v2 id: cache-libc6-i386 with: - path: /var/cache/apt/archives/libc6-i386_2.27-3ubuntu1_amd64.deb + path: /usr/share/lintian/overrides/libc6-i386 key: ${{ runner.os }}-libc6-i386 # /usr/share/doc/libc6-i386 # /usr/share/lintian/overrides/libc6-i386 @@ -63,7 +63,7 @@ jobs: - uses: actions/cache@v2 id: cache-linux-module with: - path: /var/cache/apt/apt-fast/linux-modules-extra-4.15.0-1108-azure_4.15.0-1108.120~16.04.1_amd64.deb + path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic key: ${{ runner.os }}-linux-module # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postinst # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postrm From 866d39d9bfa60559754f702a6c9a106e776932b1 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 2 Apr 2021 02:28:19 +0000 Subject: [PATCH 18/68] trying out /usr/bin/make --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c1511564..291b24b55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: - uses: actions/cache@v2 id: cache-libc6-i386 with: - path: /usr/share/lintian/overrides/libc6-i386 + path: /var/lib/dpkg/info/libc6-i386 key: ${{ runner.os }}-libc6-i386 # /usr/share/doc/libc6-i386 # /usr/share/lintian/overrides/libc6-i386 @@ -73,9 +73,9 @@ jobs: - uses: actions/cache@v2 id: cache-make with: - path: /home/runner/work/firmware_xiv/firmware_xiv/make-4.1 + path: /usr/bin/make key: ${{ runner.os }}-make - + # /home/runner/work/firmware_xiv/firmware_xiv/make-4.1 - uses: actions/cache@v2 id: cache-pip with: From d95c21bdc03b9a0360865f89717c082199fd43ef Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 20 May 2021 00:07:51 +0000 Subject: [PATCH 19/68] trying out dpkg for gcc --- .github/workflows/main.yml | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 291b24b55..52c0d46d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: /usr/bin/gcc + path: "~/gcc" key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -49,33 +49,19 @@ jobs: with: path: /var/lib/dpkg/info/libc6-i386 key: ${{ runner.os }}-libc6-i386 - # /usr/share/doc/libc6-i386 - # /usr/share/lintian/overrides/libc6-i386 - - # /var/lib/dpkg/info/libc6-i386.shlibs - # /var/lib/dpkg/info/libc6-i386.triggers - # /var/lib/dpkg/info/libc6-i386.conffiles - # /var/lib/dpkg/info/libc6-i386.postrm - # /var/lib/dpkg/info/libc6-i386.list - # /var/lib/dpkg/info/libc6-i386.md5sums - # /var/lib/dpkg/info/libc6-i386.symbols - uses: actions/cache@v2 id: cache-linux-module with: path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic key: ${{ runner.os }}-linux-module - # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postinst - # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.postrm - # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.list - # /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic.md5sums - uses: actions/cache@v2 id: cache-make with: path: /usr/bin/make key: ${{ runner.os }}-make - # /home/runner/work/firmware_xiv/firmware_xiv/make-4.1 + - uses: actions/cache@v2 id: cache-pip with: @@ -93,9 +79,26 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - - name: Install gcc - if: steps.cache-gcc.outputs.cache-hit != 'true' - run: sudo apt-fast -y install gcc-6 + # - name: Install gcc + # if: steps.cache-gcc.outputs.cache-hit != 'true' + # run: sudo apt-fast -y install gcc-6 + + - name: Install gcc + env: + CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} + run: | + if [[ "$CACHE_HIT" == 'true' ]]; then + sudo cp --force --recursive ~/gcc/* / + else + sudo apt-fast -y install gcc-6 + mkdir -p ~/gcc + for dep in gcc-6; do + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | + xargs cp --parents --target-directory ~/gcc/ + done + fi + + - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From 6b3e7cb523c8331af4d1c51b90470fa7a64ebf3b Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 20 May 2021 00:08:51 +0000 Subject: [PATCH 20/68] trying out dpkg for gcc --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52c0d46d1..26a2ba446 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,9 +97,7 @@ jobs: xargs cp --parents --target-directory ~/gcc/ done fi - - - + - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' run: sudo apt-fast -y install clang-5.0 From d2c68128086b52ab6a0f4bd777486a8c607ea7d2 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 02:18:40 +0000 Subject: [PATCH 21/68] Removed files that were committed by accident --- projects/104_hw_megan/README.md | 16 ---- projects/104_hw_megan/rules.mk | 9 --- projects/104_hw_megan/src/part1and2.c | 76 ------------------ projects/104_hw_megan/src/part3.c | 109 -------------------------- 4 files changed, 210 deletions(-) delete mode 100644 projects/104_hw_megan/README.md delete mode 100644 projects/104_hw_megan/rules.mk delete mode 100644 projects/104_hw_megan/src/part1and2.c delete mode 100644 projects/104_hw_megan/src/part3.c diff --git a/projects/104_hw_megan/README.md b/projects/104_hw_megan/README.md deleted file mode 100644 index 693f67168..000000000 --- a/projects/104_hw_megan/README.md +++ /dev/null @@ -1,16 +0,0 @@ - -# 104_hw_megan - diff --git a/projects/104_hw_megan/rules.mk b/projects/104_hw_megan/rules.mk deleted file mode 100644 index f1806d7cd..000000000 --- a/projects/104_hw_megan/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Defines $(T)_SRC, $(T)_INC, $(T)_DEPS, and $(T)_CFLAGS for the build makefile. -# Tests can be excluded by defining $(T)_EXCLUDE_TESTS. -# Pre-defined: -# $(T)_SRC_ROOT: $(T)_DIR/src -# $(T)_INC_DIRS: $(T)_DIR/inc{/$(PLATFORM)} -# $(T)_SRC: $(T)_DIR/src{/$(PLATFORM)}/*.{c,s} - -# Specify the libraries you want to include -$(T)_DEPS := ms-common diff --git a/projects/104_hw_megan/src/part1and2.c b/projects/104_hw_megan/src/part1and2.c deleted file mode 100644 index d3c92c6e3..000000000 --- a/projects/104_hw_megan/src/part1and2.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "gpio.h" -#include "i2c.h" -#include "log.h" -#include "spi.h" - -#define CONFIG_ADDRESS 0x01 -#define CONVERSION_ADDRESS 0x0 -#define I2C_ADDRESS 0x48 - -#define I2C_SDA \ - { .port = GPIO_PORT_B, .pin = 11 } -#define I2C_SCL \ - { .port = GPIO_PORT_B, .pin = 10 } - -StatusCode write_read_i2c(void) { - I2CSettings i2c_settings = { - .speed = I2C_SPEED_FAST, - .sda = I2C_SDA, - .scl = I2C_SCL, - }; - i2c_init(I2C_PORT_2, &i2c_settings); - - uint8_t read_bytes[2] = { 0 }; - - uint8_t bytes_to_write[] = { 0b00100100, 0b10100110 }; - - status_ok_or_return(i2c_write_reg(I2C_PORT_2, I2C_ADDRESS, CONFIG_ADDRESS, bytes_to_write, - SIZEOF_ARRAY(bytes_to_write))); - - status_ok_or_return(i2c_read_reg(I2C_PORT_2, I2C_ADDRESS, CONVERSION_ADDRESS, read_bytes, 2)); - - return STATUS_CODE_OK; -} - -#define SPI_MOSI \ - { .port = GPIO_PORT_B, .pin = 15 } -#define SPI_MISO \ - { .port = GPIO_PORT_B, .pin = 14 } -#define SPI_SCLK \ - { .port = GPIO_PORT_B, .pin = 13 } -#define SPI_CS \ - { .port = GPIO_PORT_B, .pin = 12 } - -StatusCode read_spi(void) { - SpiPort port_to_use = SPI_PORT_2; - - SpiSettings spi_settings = { - .baudrate = 6000000, - .mode = SPI_MODE_0, - .mosi = SPI_MOSI, - .miso = SPI_MISO, - .sclk = SPI_SCLK, - .cs = SPI_CS, - }; - spi_init(port_to_use, &spi_settings); - - // 010 sets loopback mode - // 0 terminated request to abort all transmissions - // 1 enables one-shot mode - // 0 disables CLKOUT pin - // 01 set CLKOUT prescaler to system clock/2 - uint8_t write_data = 0b01001001; - - status_ok_or_return(port_to_us, &write_data, sizeof(write_data)); - - uint8_t read_status_data = 0b10100000; - - uint8_t response; - - status_ok_or_return(spi_exchange(port_to_use, &read_status_data, sizeof(read_status_data), - &response, sizeof(response))); - - LOG_DEBUG("Response is: %d\n", response >> 4); - - return STATUS_CODE_OK; -} diff --git a/projects/104_hw_megan/src/part3.c b/projects/104_hw_megan/src/part3.c deleted file mode 100644 index fb4a464df..000000000 --- a/projects/104_hw_megan/src/part3.c +++ /dev/null @@ -1,109 +0,0 @@ -#include "can.h" -#include "can_ack.h" -#include "event_queue.h" -#include "gpio.h" -#include "interrupt.h" -#include "log.h" -#include "soft_timer.h" - -#define MSG_ID_A 0xA -#define MSG_ID_B 0xB -#define CAN_DEVICE_ID 0x1 -#define SEND_TIME 1000 - -typedef enum { - CAN_ACK_DEVICE_A = 0, - CAN_ACL_DEVICE_B, -} Can_Ack_Devices; - -typedef enum { - CAN_EVENT_RX = 0, - CAN_EVENT_TX, - CAN_EVENT_FAULT, -} CanEvent; - -static CanStorage s_can_storage = { 0 }; - -static StatusCode prv_ack_request(CanMessageId msg_id, uint16_t device, CanAckStatus status, - uint16_t num_remaining, void *context) { - if (status == CAN_ACK_STATUS_OK) - LOG_DEBUG("acked %d\n", msg_id); - else - LOG_DEBUG("not acked %d\n", msg_id); - - return STATUS_CODE_OK; -} - -static void prv_can_transmit_A(SoftTimerId timer_id, void *context) { - CanMessage message_A = { .source_id = CAN_DEVICE_ID, - .msg_id = MSG_ID_A, - .data_u16 = 0xF8F3, - .type = CAN_MSG_TYPE_DATA, - .dlc = 2 }; - - CanAckRequest ack_request = { .callback = prv_ack_request, - .context = NULL, - .expected_bitset = CAN_ACK_EXPECTED_DEVICES(CAN_ACK_DEVICE_A) }; - - can_transmit(&message_A, &ack_request); - - soft_timer_start_millis(SEND_TIME, prv_can_transmit_A, NULL, NULL); -} - -static void prv_can_transmit_B(SoftTimerId timer_id, void *context) { - CanMessage message_B = { .source_id = CAN_DEVICE_ID, - .msg_id = MSG_ID_B, - .data_u16 = 0x83DF, - .type = CAN_MSG_TYPE_DATA, - .dlc = 2 }; - - can_transmit(&message_B, NULL); - - soft_timer_start_millis(SEND_TIME, prv_can_transmit_B, NULL, NULL); -} - -static StatusCode prv_rx_callback(const CanMessage *msg, void *context, CanAckStatus *ack_reply) { - printf("Data: \n\t"); - uint8_t i; - for (i = 0; i < msg->dlc; i++) { - uint8_t byte = (msg->data >> (i * 8) & 0xFF); - printf("%x", byte); - } - printf("\n"); - - return STATUS_CODE_OK; -} - -int main() { - gpio_init(); - event_queue_init(); - interrupt_init(); - soft_timer_init(); - - CanSettings can_settings = { - .device_id = CAN_DEVICE_ID, - .bitrate = CAN_HW_BITRATE_500KBPS, - .rx_event = CAN_EVENT_RX, - .tx_event = CAN_EVENT_TX, - .fault_event = CAN_EVENT_FAULT, - .tx = { GPIO_PORT_A, 12 }, - .rx = { GPIO_PORT_A, 11 }, - .loopback = false, - }; - - can_init(&s_can_storage, &can_settings); - can_register_rx_handler(MSG_ID_A, prv_rx_callback, NULL); - can_register_rx_handler(MSG_ID_B, prv_rx_callback, NULL); - - soft_timer_start_millis(SEND_TIME, prv_can_transmit_A, NULL, NULL); - soft_timer_start_millis(SEND_TIME, prv_can_transmit_B, NULL, NULL); - - Event e = { 0 }; - while (true) { - while (event_process(&e) == STATUS_CODE_OK) { - can_process_event(&e); - } - } - - return 0; -} From 2ce2d4c13525489eb6001f168f9905749b5b4626 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 21:28:09 +0000 Subject: [PATCH 22/68] Fixed indentation issues --- .github/workflows/main.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2e3e2ec3..6ea1bd77b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -94,8 +94,7 @@ jobs: sudo apt-fast -y install gcc-6 mkdir -p ~/gcc for dep in gcc-6; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | - xargs cp --parents --target-directory ~/gcc/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ done fi @@ -109,8 +108,7 @@ jobs: sudo apt-fast -y install clang-5.0 mkdir -p /usr/bin/clang-5.0 for dep in clang-5.0; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | - xargs cp --parents --target-directory /usr/bin/clang-5.0/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/clang-5.0/ done fi @@ -124,8 +122,7 @@ jobs: sudo apt-fast -y install clang-format-5.0 mkdir -p /usr/bin/clang-format-5.0 for dep in clang-format-5.0; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | - xargs cp --parents --target-directory /usr/bin/clang-format-5.0/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/clang-format-5.0/ done fi @@ -139,8 +136,7 @@ jobs: sudo apt-fast -y install libc6-i386 mkdir -p /var/lib/dpkg/info/libc6-i386 for dep in libc6-i386; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | - xargs cp --parents --target-directory /var/lib/dpkg/info/libc6-i386/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /var/lib/dpkg/info/libc6-i386/ done fi @@ -155,8 +151,7 @@ jobs: sudo apt-fast -y install linux-modules-extra-$(uname -r) mkdir -p /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic for dep in linux-modules-extra-$(uname -r); do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | - xargs cp --parents --target-directory /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic/ done fi From 73b575618cfe32248699c32ab5d581075152bbfe Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 22:15:16 +0000 Subject: [PATCH 23/68] Removed duplicated line --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ea1bd77b..1568aec28 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -222,7 +222,7 @@ jobs: - name: Pylint run: make pylint - - name: Build stm32f0xx + #- name: Build stm32f0xx - name: Build codegen run: | make codegen From bde17f8544dfc02cc1a96b182139e896db4a4392 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 22:37:23 +0000 Subject: [PATCH 24/68] Removed dpkg to test clang installation --- .github/workflows/main.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1568aec28..486f6247c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,18 +99,20 @@ jobs: fi - name: Install clang - env: - CACHE_HIT: ${{steps.cache-clang.outputs.cache-hit}} - run: | - if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /usr/bin/clang-5.0/* / - else - sudo apt-fast -y install clang-5.0 - mkdir -p /usr/bin/clang-5.0 - for dep in clang-5.0; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/clang-5.0/ - done - fi + if: steps.cache-clang.outputs.cache-hit != 'true' + run: sudo apt-fast -y install clang-5.0 + #env: + # CACHE_HIT: ${{steps.cache-clang.outputs.cache-hit}} + #run: | + # if [[ "$CACHE_HIT" == 'true' ]]; then + # sudo cp --force --recursive /usr/bin/clang-5.0/* / + # else + # sudo apt-fast -y install clang-5.0 + # mkdir -p /usr/bin/clang-5.0 + # for dep in clang-5.0; do + # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/clang-5.0/ + # done + # fi - name: Install clang-format env: From ffed2f51e01a2f8baff73892f1c5aef94b4622df Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 22:44:36 +0000 Subject: [PATCH 25/68] Removed dpkg for other apt-get dependencies --- .github/workflows/main.yml | 42 ++++++-------------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 486f6247c..aa10924d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,47 +115,17 @@ jobs: # fi - name: Install clang-format - env: - CACHE_HIT: ${{steps.cache-clang-format.outputs.cache-hit}} - run: | - if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /usr/bin/clang-format-5.0/* / - else - sudo apt-fast -y install clang-format-5.0 - mkdir -p /usr/bin/clang-format-5.0 - for dep in clang-format-5.0; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/clang-format-5.0/ - done - fi + if: steps.cache-clang-format.outputs.cache-hit != 'true' + run: sudo apt-fast -y install clang-format-5.0 - name: Install libc6-i386 - env: - CACHE_HIT: ${{steps.cache-libc6-i386.outputs.cache-hit}} - run: | - if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /var/lib/dpkg/info/libc6-i386/* / - else - sudo apt-fast -y install libc6-i386 - mkdir -p /var/lib/dpkg/info/libc6-i386 - for dep in libc6-i386; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /var/lib/dpkg/info/libc6-i386/ - done - fi + if: steps.cache-libc6-i386.outputs.cache-hit != 'true' + run: sudo apt-fast -y install libc6-i386 # for vcan module - name: Install linux modules - env: - CACHE_HIT: ${{steps.cache-linux-module.outputs.cache-hit}} - run: | - if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic/* / - else - sudo apt-fast -y install linux-modules-extra-$(uname -r) - mkdir -p /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic - for dep in linux-modules-extra-$(uname -r); do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic/ - done - fi + if: steps.cache-linux-module.outputs.cache-hit != 'true' + run: sudo apt-fast -y install linux-modules-extra-$(uname -r) - name: Which gcc, clang, clang-format run: | From 4b438d847a29ea1a568b286c2210c69f092713fe Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 23:13:53 +0000 Subject: [PATCH 26/68] Changed path of clang, clang-format --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa10924d3..6ac16c9b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,13 +36,15 @@ jobs: - uses: actions/cache@v2 id: cache-clang with: - path: /usr/bin/clang-5.0 + #path: /usr/bin/clang-5.0 + path: /lib/llvm-5.0/bin/clang key: ${{ runner.os }}-clang - uses: actions/cache@v2 id: cache-clang-format with: - path: /usr/bin/clang-format-5.0 + #path: /usr/bin/clang-format-5.0 + path: /lib/llvm-5.0/bin/clang-format key: ${{ runner.os }}-clang-format - uses: actions/cache@v2 From 9aa1e06be6e0ed59b2a117702644f7d4867c2e41 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 23:34:49 +0000 Subject: [PATCH 27/68] Changed paths back to original --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ac16c9b9..aa10924d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,15 +36,13 @@ jobs: - uses: actions/cache@v2 id: cache-clang with: - #path: /usr/bin/clang-5.0 - path: /lib/llvm-5.0/bin/clang + path: /usr/bin/clang-5.0 key: ${{ runner.os }}-clang - uses: actions/cache@v2 id: cache-clang-format with: - #path: /usr/bin/clang-format-5.0 - path: /lib/llvm-5.0/bin/clang-format + path: /usr/bin/clang-format-5.0 key: ${{ runner.os }}-clang-format - uses: actions/cache@v2 From 5b0368c2be783f02caf9d80b08ff7aef72ae0f30 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 18 Jul 2021 23:46:23 +0000 Subject: [PATCH 28/68] Removed dpkg for gcc to test --- .github/workflows/main.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa10924d3..134927c2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,23 +80,23 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - # - name: Install gcc - # if: steps.cache-gcc.outputs.cache-hit != 'true' - # run: sudo apt-fast -y install gcc-6 - - - name: Install gcc - env: - CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} - run: | - if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ~/gcc/* / - else - sudo apt-fast -y install gcc-6 - mkdir -p ~/gcc - for dep in gcc-6; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ - done - fi + - name: Install gcc + if: steps.cache-gcc.outputs.cache-hit != 'true' + run: sudo apt-fast -y install gcc-6 + + #- name: Install gcc + # env: + # CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} + # run: | + # if [[ "$CACHE_HIT" == 'true' ]]; then + # sudo cp --force --recursive ~/gcc/* / + # else + # sudo apt-fast -y install gcc-6 + # mkdir -p ~/gcc + # for dep in gcc-6; do + # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + # done + # fi - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From f5a50d29f748397ad4c122fa59d26335e1262674 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 19 Jul 2021 00:02:17 +0000 Subject: [PATCH 29/68] Changed directory for printing arm --- .github/workflows/main.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 134927c2b..7103bf57b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -171,7 +171,7 @@ jobs: pip install --upgrade setuptools make install_requirements - - name: Print versions of everything + - name: Print version of arm run: | arm-none-eabi-gcc --version arm-none-eabi-objcopy --version @@ -179,6 +179,17 @@ jobs: arm-none-eabi-size --version arm-none-eabi-gcc-ar --version arm-none-eabi-gdb --version + working-directory: /home/runner/.arm-none-eabi-gcc-cache + + - name: Print versions of everything + #run: | + # arm-none-eabi-gcc --version + # arm-none-eabi-objcopy --version + # arm-none-eabi-objdump --version + # arm-none-eabi-size --version + # arm-none-eabi-gcc-ar --version + # arm-none-eabi-gdb --version + run: | gcc --version make --version clang --version From 6003666b181da47ad500dbf06720bd8e0707a7be Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 19 Jul 2021 00:07:42 +0000 Subject: [PATCH 30/68] Changed directory syntax for printing arm --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7103bf57b..ccef70d46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -179,7 +179,8 @@ jobs: arm-none-eabi-size --version arm-none-eabi-gcc-ar --version arm-none-eabi-gdb --version - working-directory: /home/runner/.arm-none-eabi-gcc-cache + with: + directory: /home/runner/.arm-none-eabi-gcc-cache - name: Print versions of everything #run: | From 1078b510a4ee2b327fa99572b129de0fc46d7ee5 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 19 Jul 2021 00:15:27 +0000 Subject: [PATCH 31/68] Removed changes from last commit --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccef70d46..7103bf57b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -179,8 +179,7 @@ jobs: arm-none-eabi-size --version arm-none-eabi-gcc-ar --version arm-none-eabi-gdb --version - with: - directory: /home/runner/.arm-none-eabi-gcc-cache + working-directory: /home/runner/.arm-none-eabi-gcc-cache - name: Print versions of everything #run: | From d8d2bf54e271a8bba5430ae694d33238d6855403 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Tue, 20 Jul 2021 03:22:54 +0000 Subject: [PATCH 32/68] Added arm to PATH --- .github/workflows/main.yml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7103bf57b..5d3b84e94 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: - uses: actions/cache@v2 id: cache-arm-v1 with: - path: /home/runner/.arm-none-eabi-gcc-cache + path: /$HOME/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm-v1 - name: Add repo and update @@ -135,13 +135,15 @@ jobs: - name: Make arm cache directory run: - mkdir -p /home/runner/.arm-none-eabi-gcc-cache + #mkdir -p /home/runner/.arm-none-eabi-gcc-cache + mkdir -p ~/.arm-none-eabi-gcc-cache + echo "${HOME}/.arm-none-eabi-gcc-cache" >> $GITHUB_PATH - if: steps.cache-arm-v1.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' - directory: /home/runner/.arm-none-eabi-gcc-cache + directory: /$HOME/.arm-none-eabi-gcc-cache - name: Install GNU Make 4.1 env: @@ -171,7 +173,7 @@ jobs: pip install --upgrade setuptools make install_requirements - - name: Print version of arm + - name: Print versions of everything run: | arm-none-eabi-gcc --version arm-none-eabi-objcopy --version @@ -179,17 +181,6 @@ jobs: arm-none-eabi-size --version arm-none-eabi-gcc-ar --version arm-none-eabi-gdb --version - working-directory: /home/runner/.arm-none-eabi-gcc-cache - - - name: Print versions of everything - #run: | - # arm-none-eabi-gcc --version - # arm-none-eabi-objcopy --version - # arm-none-eabi-objdump --version - # arm-none-eabi-size --version - # arm-none-eabi-gcc-ar --version - # arm-none-eabi-gdb --version - run: | gcc --version make --version clang --version From 1b1542ffbe34ac99dbbd8b0e148aa6b925e54b63 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Tue, 20 Jul 2021 03:31:58 +0000 Subject: [PATCH 33/68] Removed directory for arm installation --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d3b84e94..99cd5a6c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' - directory: /$HOME/.arm-none-eabi-gcc-cache + #directory: /$HOME/.arm-none-eabi-gcc-cache - name: Install GNU Make 4.1 env: From 79daa63e236b2649d2dc72061acb38c5e3e3fea3 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Wed, 21 Jul 2021 03:02:19 +0000 Subject: [PATCH 34/68] Added pip cache directory to PATH --- .github/workflows/main.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 99cd5a6c5..393c4e7f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,7 +66,7 @@ jobs: - uses: actions/cache@v2 id: cache-pip with: - path: /home/runner/.cache/pip + path: /$HOME/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 @@ -134,8 +134,9 @@ jobs: ln -sf `which clang-format-5.0` ~/.local/bin/clang-format - name: Make arm cache directory - run: + #run: #mkdir -p /home/runner/.arm-none-eabi-gcc-cache + run: | mkdir -p ~/.arm-none-eabi-gcc-cache echo "${HOME}/.arm-none-eabi-gcc-cache" >> $GITHUB_PATH @@ -165,6 +166,11 @@ jobs: with: python-version: '3.x' + - name: Make pip cache directory + run: | + mkdir -p ~/.cache/pip + echo "$HOME/.cache/pip" >> $GITHUB_PATH + - name: Install Python tooling if: steps.cache-pip.outputs.cache-hit != 'true' run: | From d051119d8e8d0ff71ddc75ecf6e2e549fb179df1 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Wed, 21 Jul 2021 20:31:46 +0000 Subject: [PATCH 35/68] Removed caching for gcc to test --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 393c4e7f2..c1698ca41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,11 +27,11 @@ jobs: echo "${HOME}/.local/bin" >> $GITHUB_PATH mkdir -p ~/source - - uses: actions/cache@v2 - id: cache-gcc - with: - path: "~/gcc" - key: ${{ runner.os }}-gcc + #- uses: actions/cache@v2 + # id: cache-gcc + # with: + # path: "~/gcc" + # key: ${{ runner.os }}-gcc - uses: actions/cache@v2 id: cache-clang @@ -81,7 +81,7 @@ jobs: sudo apt-get update - name: Install gcc - if: steps.cache-gcc.outputs.cache-hit != 'true' + #if: steps.cache-gcc.outputs.cache-hit != 'true' run: sudo apt-fast -y install gcc-6 #- name: Install gcc From a46518cbde46a00b781cc41fa771bd625c7ed34c Mon Sep 17 00:00:00 2001 From: Megan Park Date: Wed, 21 Jul 2021 20:40:47 +0000 Subject: [PATCH 36/68] Changed gcc path --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1698ca41..7f4496bf2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,11 +27,11 @@ jobs: echo "${HOME}/.local/bin" >> $GITHUB_PATH mkdir -p ~/source - #- uses: actions/cache@v2 - # id: cache-gcc - # with: - # path: "~/gcc" - # key: ${{ runner.os }}-gcc + - uses: actions/cache@v2 + id: cache-gcc-6 + with: + path: "/user/bin/gcc-6" + key: ${{ runner.os }}-gcc-6 - uses: actions/cache@v2 id: cache-clang @@ -81,7 +81,7 @@ jobs: sudo apt-get update - name: Install gcc - #if: steps.cache-gcc.outputs.cache-hit != 'true' + if: steps.cache-gcc-6.outputs.cache-hit != 'true' run: sudo apt-fast -y install gcc-6 #- name: Install gcc From 1771bd40e689e13d6d33355a0e2cd12bf79639cd Mon Sep 17 00:00:00 2001 From: Megan Park Date: Wed, 21 Jul 2021 21:05:33 +0000 Subject: [PATCH 37/68] Removed caching for vcan to test --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f4496bf2..c8d4d0f95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,11 +51,11 @@ jobs: path: /var/lib/dpkg/info/libc6-i386 key: ${{ runner.os }}-libc6-i386 - - uses: actions/cache@v2 - id: cache-linux-module - with: - path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic - key: ${{ runner.os }}-linux-module + #- uses: actions/cache@v2 + # id: cache-linux-module + # with: + # path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic + # key: ${{ runner.os }}-linux-module - uses: actions/cache@v2 id: cache-make @@ -124,7 +124,7 @@ jobs: # for vcan module - name: Install linux modules - if: steps.cache-linux-module.outputs.cache-hit != 'true' + #if: steps.cache-linux-module.outputs.cache-hit != 'true' run: sudo apt-fast -y install linux-modules-extra-$(uname -r) - name: Which gcc, clang, clang-format From 92ba42323984c65de3d51fd3859c12bc5fc2f9c6 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Wed, 21 Jul 2021 21:31:51 +0000 Subject: [PATCH 38/68] Changed vcan path --- .github/workflows/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8d4d0f95..b77878b88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,11 +51,12 @@ jobs: path: /var/lib/dpkg/info/libc6-i386 key: ${{ runner.os }}-libc6-i386 - #- uses: actions/cache@v2 - # id: cache-linux-module - # with: - # path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic - # key: ${{ runner.os }}-linux-module + - uses: actions/cache@v2 + id: cache-linux-module + with: + #path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic + path: /lib/modules/'uname-r' + key: ${{ runner.os }}-linux-module - uses: actions/cache@v2 id: cache-make @@ -124,7 +125,7 @@ jobs: # for vcan module - name: Install linux modules - #if: steps.cache-linux-module.outputs.cache-hit != 'true' + if: steps.cache-linux-module.outputs.cache-hit != 'true' run: sudo apt-fast -y install linux-modules-extra-$(uname -r) - name: Which gcc, clang, clang-format From d36860e59a3e3691990c0be3e0b9e51ef1c5871f Mon Sep 17 00:00:00 2001 From: Megan Park Date: Thu, 22 Jul 2021 03:12:14 +0000 Subject: [PATCH 39/68] testing path --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b77878b88..88dce8a21 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -171,6 +171,7 @@ jobs: run: | mkdir -p ~/.cache/pip echo "$HOME/.cache/pip" >> $GITHUB_PATH + echo "$PATH" - name: Install Python tooling if: steps.cache-pip.outputs.cache-hit != 'true' From 5be91dba07ddd2c5c21ddb08d105d5f1adca3f39 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Thu, 22 Jul 2021 03:24:08 +0000 Subject: [PATCH 40/68] Updated arm path --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88dce8a21..89ee28871 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,7 +73,7 @@ jobs: - uses: actions/cache@v2 id: cache-arm-v1 with: - path: /$HOME/.arm-none-eabi-gcc-cache + path: $HOME/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm-v1 - name: Add repo and update @@ -145,7 +145,7 @@ jobs: uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' - #directory: /$HOME/.arm-none-eabi-gcc-cache + directory: $HOME/.arm-none-eabi-gcc-cache - name: Install GNU Make 4.1 env: @@ -171,7 +171,6 @@ jobs: run: | mkdir -p ~/.cache/pip echo "$HOME/.cache/pip" >> $GITHUB_PATH - echo "$PATH" - name: Install Python tooling if: steps.cache-pip.outputs.cache-hit != 'true' From 24a03fb84c0a9e3c85a964ce86023321183119f4 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Thu, 22 Jul 2021 03:29:26 +0000 Subject: [PATCH 41/68] Updated pip directory --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89ee28871..591ab26f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,7 +67,7 @@ jobs: - uses: actions/cache@v2 id: cache-pip with: - path: /$HOME/.cache/pip + path: $HOME/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 @@ -179,6 +179,8 @@ jobs: pip install --upgrade pip pip install --upgrade setuptools make install_requirements + with: + directory: $HOME/.cache/pip - name: Print versions of everything run: | From 09be768025a4c86deaba159631b613b5eafe3daa Mon Sep 17 00:00:00 2001 From: Megan Park Date: Thu, 22 Jul 2021 03:44:45 +0000 Subject: [PATCH 42/68] Testing new path and key for pip --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 591ab26f9..588635c2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,8 +67,10 @@ jobs: - uses: actions/cache@v2 id: cache-pip with: - path: $HOME/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + #path: $HOME/.cache/pip + path: ${{ env.pythonLocation }} + key: ${{ env.pythonLocation }}-pip-${{ hashFiles('**/requirements.txt') }} + #key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 id: cache-arm-v1 @@ -167,10 +169,10 @@ jobs: with: python-version: '3.x' - - name: Make pip cache directory - run: | - mkdir -p ~/.cache/pip - echo "$HOME/.cache/pip" >> $GITHUB_PATH + #- name: Make pip cache directory + # run: | + # mkdir -p ~/.cache/pip + # echo "$HOME/.cache/pip" >> $GITHUB_PATH - name: Install Python tooling if: steps.cache-pip.outputs.cache-hit != 'true' @@ -179,8 +181,6 @@ jobs: pip install --upgrade pip pip install --upgrade setuptools make install_requirements - with: - directory: $HOME/.cache/pip - name: Print versions of everything run: | From 8cd2c15dfaf19a48e03c752975415982f365bfc9 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Thu, 22 Jul 2021 03:48:28 +0000 Subject: [PATCH 43/68] Testing pip path --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 588635c2a..ddd11c05c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,9 +67,9 @@ jobs: - uses: actions/cache@v2 id: cache-pip with: - #path: $HOME/.cache/pip path: ${{ env.pythonLocation }} key: ${{ env.pythonLocation }}-pip-${{ hashFiles('**/requirements.txt') }} + #path: $HOME/.cache/pip #key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - uses: actions/cache@v2 From 7d6ef77a03b6ecef1d234d5345c4af843f8bfe27 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Thu, 22 Jul 2021 03:51:48 +0000 Subject: [PATCH 44/68] Changed pip path --- .github/workflows/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ddd11c05c..355c8a16f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,10 +67,9 @@ jobs: - uses: actions/cache@v2 id: cache-pip with: - path: ${{ env.pythonLocation }} - key: ${{ env.pythonLocation }}-pip-${{ hashFiles('**/requirements.txt') }} - #path: $HOME/.cache/pip - #key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + #path: $HOME/.cache/pip - uses: actions/cache@v2 id: cache-arm-v1 From e1ce52c2c8d86bd6bf64d5792988b3ad099cc1d3 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Fri, 23 Jul 2021 03:05:51 +0000 Subject: [PATCH 45/68] Testing dpkg for gcc --- .github/workflows/main.yml | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 355c8a16f..e1a1d8efc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,8 @@ jobs: - uses: actions/cache@v2 id: cache-gcc-6 with: - path: "/user/bin/gcc-6" + #path: "/user/bin/gcc-6" + path: "~/gcc-6" key: ${{ runner.os }}-gcc-6 - uses: actions/cache@v2 @@ -82,23 +83,24 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - - name: Install gcc - if: steps.cache-gcc-6.outputs.cache-hit != 'true' - run: sudo apt-fast -y install gcc-6 + #- name: Install gcc + # if: steps.cache-gcc-6.outputs.cache-hit != 'true' + # run: sudo apt-fast -y install gcc-6 - #- name: Install gcc - # env: - # CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} - # run: | - # if [[ "$CACHE_HIT" == 'true' ]]; then - # sudo cp --force --recursive ~/gcc/* / - # else - # sudo apt-fast -y install gcc-6 - # mkdir -p ~/gcc - # for dep in gcc-6; do - # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ - # done - # fi + - name: Install gcc + env: + CACHE_HIT: ${{steps.cache-gcc-6.outputs.cache-hit}} + run: | + if [[ "$CACHE_HIT" == 'true' ]]; then + sudo cp --force --recursive ~/gcc-6/* / + else + sudo apt-fast -y install gcc-6 + mkdir -p ~/gcc-6 + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ + for dep in cpp-6 gcc-6-base libcc1-0 binutils libgcc-6-dev libc6 libgcc1 libgmp10 libisl19 libmpc3 libmpfr6 libstdc++6 zlib1g; do + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ + done + fi - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From 56a55d0fad406138ee084ebc08ddf3613831f117 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Fri, 23 Jul 2021 03:14:58 +0000 Subject: [PATCH 46/68] Changed dependencies for gcc installation --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1a1d8efc..f9ab3da6b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,7 +97,8 @@ jobs: sudo apt-fast -y install gcc-6 mkdir -p ~/gcc-6 sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ - for dep in cpp-6 gcc-6-base libcc1-0 binutils libgcc-6-dev libc6 libgcc1 libgmp10 libisl19 libmpc3 libmpfr6 libstdc++6 zlib1g; do + # for dep in cpp-6 gcc-6-base libcc1-0 binutils libgcc-6-dev libc6 libgcc1 libgmp10 libisl19 libmpc3 libmpfr6 libstdc++6 zlib1g; do + for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ done fi From 33da8da9d5fd7e6b431f9b1a3736084ff3ce35dc Mon Sep 17 00:00:00 2001 From: Megan Park Date: Fri, 23 Jul 2021 03:17:49 +0000 Subject: [PATCH 47/68] Fixed syntax error --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9ab3da6b..54814f1d4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,12 +96,13 @@ jobs: else sudo apt-fast -y install gcc-6 mkdir -p ~/gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ - # for dep in cpp-6 gcc-6-base libcc1-0 binutils libgcc-6-dev libc6 libgcc1 libgmp10 libisl19 libmpc3 libmpfr6 libstdc++6 zlib1g; do + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ done fi + + # for dep in cpp-6 gcc-6-base libcc1-0 binutils libgcc-6-dev libc6 libgcc1 libgmp10 libisl19 libmpc3 libmpfr6 libstdc++6 zlib1g; do - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From 0036a3a88c537c50770f1cc0d7f02e117260f25f Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 25 Jul 2021 02:35:08 +0000 Subject: [PATCH 48/68] Changed arm path --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54814f1d4..3d24a1d53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: - uses: actions/cache@v2 id: cache-arm-v1 with: - path: $HOME/.arm-none-eabi-gcc-cache + path: $HOME/.arm-none-eabi-gcc-cache/bin key: ${{ runner.os }}-arm-v1 - name: Add repo and update @@ -143,14 +143,14 @@ jobs: #run: #mkdir -p /home/runner/.arm-none-eabi-gcc-cache run: | - mkdir -p ~/.arm-none-eabi-gcc-cache - echo "${HOME}/.arm-none-eabi-gcc-cache" >> $GITHUB_PATH + mkdir -p ~/.arm-none-eabi-gcc-cache/bin + echo "${HOME}/.arm-none-eabi-gcc-cache/bin" >> $GITHUB_PATH - if: steps.cache-arm-v1.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' - directory: $HOME/.arm-none-eabi-gcc-cache + directory: $HOME/.arm-none-eabi-gcc-cache/bin - name: Install GNU Make 4.1 env: From 35b5dbb07578fe5f444c37dbc03f30bccb915af7 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 25 Jul 2021 02:42:20 +0000 Subject: [PATCH 49/68] Testing gcc path --- .github/workflows/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d24a1d53..2273b9926 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,11 +28,11 @@ jobs: mkdir -p ~/source - uses: actions/cache@v2 - id: cache-gcc-6 + id: cache-gcc with: #path: "/user/bin/gcc-6" - path: "~/gcc-6" - key: ${{ runner.os }}-gcc-6 + path: "~/gcc" + key: ${{ runner.os }}-gcc - uses: actions/cache@v2 id: cache-clang @@ -75,7 +75,7 @@ jobs: - uses: actions/cache@v2 id: cache-arm-v1 with: - path: $HOME/.arm-none-eabi-gcc-cache/bin + path: $HOME/.arm-none-eabi-gcc-cache key: ${{ runner.os }}-arm-v1 - name: Add repo and update @@ -89,16 +89,16 @@ jobs: - name: Install gcc env: - CACHE_HIT: ${{steps.cache-gcc-6.outputs.cache-hit}} + CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ~/gcc-6/* / + sudo cp --force --recursive ~/gcc/* / else sudo apt-fast -y install gcc-6 - mkdir -p ~/gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ + mkdir -p ~/gcc + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc-6/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ done fi @@ -143,14 +143,14 @@ jobs: #run: #mkdir -p /home/runner/.arm-none-eabi-gcc-cache run: | - mkdir -p ~/.arm-none-eabi-gcc-cache/bin - echo "${HOME}/.arm-none-eabi-gcc-cache/bin" >> $GITHUB_PATH + mkdir -p ~/.arm-none-eabi-gcc-cache + echo "${HOME}/.arm-none-eabi-gcc-cache" >> $GITHUB_PATH - if: steps.cache-arm-v1.outputs.cache-hit != 'true' uses: fiam/arm-none-eabi-gcc@v1 with: release: '6-2017-q2' - directory: $HOME/.arm-none-eabi-gcc-cache/bin + directory: $HOME/.arm-none-eabi-gcc-cache - name: Install GNU Make 4.1 env: From 14a3000f6335906d9dbb3c3e605034af74f41341 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 25 Jul 2021 02:56:31 +0000 Subject: [PATCH 50/68] Changed gcc path --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2273b9926..6cffab820 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: id: cache-gcc with: #path: "/user/bin/gcc-6" - path: "~/gcc" + path: ~/gcc key: ${{ runner.os }}-gcc - uses: actions/cache@v2 From 09a3700c0921b6286e4555265fad8c46b6528e20 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Sun, 25 Jul 2021 03:02:58 +0000 Subject: [PATCH 51/68] Testing if adding gcc cache dir to path works --- .github/workflows/main.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cffab820..556da2cd9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: id: cache-gcc with: #path: "/user/bin/gcc-6" - path: ~/gcc + path: ${HOME}/.gcc-cache key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -87,18 +87,22 @@ jobs: # if: steps.cache-gcc-6.outputs.cache-hit != 'true' # run: sudo apt-fast -y install gcc-6 + - name: Make gcc cache directory + run: | + mkdir -p ~/.gcc-cache + echo "${HOME}/.gcc-cache" >> $GITHUB_PATH + - name: Install gcc env: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ~/gcc/* / + sudo cp --force --recursive ${HOME}/.gcc-cache/* / else sudo apt-fast -y install gcc-6 - mkdir -p ~/gcc - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ${HOME}/.gcc-cache/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ${HOME}/.gcc-cache/ done fi From bb5ee01f96a29e285b293566742382d08c134b13 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 26 Jul 2021 03:04:59 +0000 Subject: [PATCH 52/68] Removed previous gcc changes, added step to update PATH --- .github/workflows/main.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 556da2cd9..3ace928db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,8 +30,8 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - #path: "/user/bin/gcc-6" - path: ${HOME}/.gcc-cache + #path: /user/bin/gcc-6 + path: ~/gcc key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -87,22 +87,17 @@ jobs: # if: steps.cache-gcc-6.outputs.cache-hit != 'true' # run: sudo apt-fast -y install gcc-6 - - name: Make gcc cache directory - run: | - mkdir -p ~/.gcc-cache - echo "${HOME}/.gcc-cache" >> $GITHUB_PATH - - name: Install gcc env: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ${HOME}/.gcc-cache/* / + sudo cp --force --recursive ~/gcc/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ${HOME}/.gcc-cache/ + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ${HOME}/.gcc-cache/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ done fi @@ -189,6 +184,9 @@ jobs: pip install --upgrade setuptools make install_requirements + - name: Force PATH to update + run: hash -r + - name: Print versions of everything run: | arm-none-eabi-gcc --version From b372adf79b4a7ae09850eaf7ff8321c76a9d17b4 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 26 Jul 2021 03:15:43 +0000 Subject: [PATCH 53/68] Testing gcc path --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ace928db..c1bd2281d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: id: cache-gcc with: #path: /user/bin/gcc-6 - path: ~/gcc + path: ~/.gcc/bin key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -92,12 +92,12 @@ jobs: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ~/gcc/* / + sudo cp --force --recursive ~/.gcc/bin/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.gcc/bin/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.gcc/bin/ done fi From 485fef31d36772f9372929bf14a3de103715fa8a Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 26 Jul 2021 03:30:14 +0000 Subject: [PATCH 54/68] Changed gcc path again --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1bd2281d..c5b2081d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,8 +30,8 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - #path: /user/bin/gcc-6 - path: ~/.gcc/bin + path: /user/bin/gcc-6 + #path: ~/.gcc/bin key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -92,12 +92,12 @@ jobs: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ~/.gcc/bin/* / + sudo cp --force --recursive /user/bin/gcc-6/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.gcc/bin/ + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.gcc/bin/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6/ done fi From ea5faf653c00c3bb3eaaf2ce5274622840fac601 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 26 Jul 2021 03:35:05 +0000 Subject: [PATCH 55/68] Changed gcc path.. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5b2081d0..4f3fdb293 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,9 +95,9 @@ jobs: sudo cp --force --recursive /user/bin/gcc-6/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6/ + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6 for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6 done fi From 396d46cf6826de40bd82f258d194d0c2e3fc4972 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 26 Jul 2021 03:37:01 +0000 Subject: [PATCH 56/68] Changed gcc path --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f3fdb293..1cf57c387 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: /user/bin/gcc-6 + path: /usr/bin/gcc-6 #path: ~/.gcc/bin key: ${{ runner.os }}-gcc @@ -92,12 +92,12 @@ jobs: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /user/bin/gcc-6/* / + sudo cp --force --recursive /usr/bin/gcc-6/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6 + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc-6 for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /user/bin/gcc-6 + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc-6 done fi From 7e12b85555db55e02af17a1b7ee37c0eb2747447 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Mon, 26 Jul 2021 03:43:18 +0000 Subject: [PATCH 57/68] Changed gcc path.. --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1cf57c387..ef41b627a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: /usr/bin/gcc-6 + path: /usr/bin/gcc #path: ~/.gcc/bin key: ${{ runner.os }}-gcc @@ -92,12 +92,12 @@ jobs: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /usr/bin/gcc-6/* / + sudo cp --force --recursive /usr/bin/gcc/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc-6 + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc-6 + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc done fi From 4656703a18fca1a4572d21d3c89b01f69b56121d Mon Sep 17 00:00:00 2001 From: Megan Park Date: Tue, 27 Jul 2021 03:09:05 +0000 Subject: [PATCH 58/68] Removed unneeded commented out code and changed gcc path --- .github/workflows/main.yml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef41b627a..b857d7ccb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,8 +55,7 @@ jobs: - uses: actions/cache@v2 id: cache-linux-module with: - #path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic - path: /lib/modules/'uname-r' + path: /var/lib/dpkg/info/linux-modules-extra-4.15.0-20-generic key: ${{ runner.os }}-linux-module - uses: actions/cache@v2 @@ -95,29 +94,15 @@ jobs: sudo cp --force --recursive /usr/bin/gcc/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc/ done fi - - # for dep in cpp-6 gcc-6-base libcc1-0 binutils libgcc-6-dev libc6 libgcc1 libgmp10 libisl19 libmpc3 libmpfr6 libstdc++6 zlib1g; do - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' run: sudo apt-fast -y install clang-5.0 - #env: - # CACHE_HIT: ${{steps.cache-clang.outputs.cache-hit}} - #run: | - # if [[ "$CACHE_HIT" == 'true' ]]; then - # sudo cp --force --recursive /usr/bin/clang-5.0/* / - # else - # sudo apt-fast -y install clang-5.0 - # mkdir -p /usr/bin/clang-5.0 - # for dep in clang-5.0; do - # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/clang-5.0/ - # done - # fi - name: Install clang-format if: steps.cache-clang-format.outputs.cache-hit != 'true' @@ -171,11 +156,6 @@ jobs: with: python-version: '3.x' - #- name: Make pip cache directory - # run: | - # mkdir -p ~/.cache/pip - # echo "$HOME/.cache/pip" >> $GITHUB_PATH - - name: Install Python tooling if: steps.cache-pip.outputs.cache-hit != 'true' run: | @@ -210,7 +190,6 @@ jobs: - name: Pylint run: make pylint - #- name: Build stm32f0xx - name: Build codegen run: | make codegen From 9a93944725643741390650fea333a1b33726c0a1 Mon Sep 17 00:00:00 2001 From: Megan Park Date: Tue, 27 Jul 2021 03:13:31 +0000 Subject: [PATCH 59/68] Changed gcc path --- .github/workflows/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b857d7ccb..beb268eb6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,8 +30,7 @@ jobs: - uses: actions/cache@v2 id: cache-gcc with: - path: /usr/bin/gcc - #path: ~/.gcc/bin + path: ~/gcc key: ${{ runner.os }}-gcc - uses: actions/cache@v2 @@ -91,12 +90,12 @@ jobs: CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} run: | if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive /usr/bin/gcc/* / + sudo cp --force --recursive ~/gcc/* / else sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc/ + sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory /usr/bin/gcc/ + dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ done fi From 6623b33a1b3e78548a067fd802c7ceee8c2e7f8d Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Thu, 16 Sep 2021 19:55:07 -0400 Subject: [PATCH 60/68] test commit --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index beb268eb6..7fb42fa08 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI on: - # Run on all pull requests and all pushes to master + #Run on all pull requests and all pushes to master push: branches: [ master ] pull_request: From 2b5fd38e9b0a7e9ca1eb428c06e7f9ca25836fb2 Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 00:36:08 -0400 Subject: [PATCH 61/68] [SOFT-438] Merged master --- .github/workflows/main.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6fe465367..3ed139242 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -85,19 +85,19 @@ jobs: # if: steps.cache-gcc-6.outputs.cache-hit != 'true' # run: sudo apt-fast -y install gcc-6 - - name: Install gcc - env: - CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} - run: | - if [[ "$CACHE_HIT" == 'true' ]]; then - sudo cp --force --recursive ~/gcc/* / - else - sudo apt-fast -y install gcc-6 - sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ - for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do - dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ - done - fi + # - name: Install gcc + # env: + # CACHE_HIT: ${{steps.cache-gcc.outputs.cache-hit}} + # run: | + # if [[ "$CACHE_HIT" == 'true' ]]; then + # sudo cp --force --recursive ~/gcc/* / + # else + # sudo apt-fast -y install gcc-6 + # sudo dpkg -L gcc-6 | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + # for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do + # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ + # done + # fi - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From 8bc554f5adeace2b1a2843b9cbafe598b2cec683 Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 01:07:33 -0400 Subject: [PATCH 62/68] [SOFT-438] test --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ed139242..2cdb93083 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,9 +81,9 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - #- name: Install gcc - # if: steps.cache-gcc-6.outputs.cache-hit != 'true' - # run: sudo apt-fast -y install gcc-6 + - name: Install gcc + if: steps.cache-gcc-6.outputs.cache-hit != 'true' + run: sudo apt-fast -y install gcc-6 # - name: Install gcc # env: From 7126ea85194b6fe170253fb736c621815dd77858 Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 01:19:20 -0400 Subject: [PATCH 63/68] [SOFT-438] test --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2cdb93083..6e64ad820 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,7 +97,8 @@ jobs: # for dep in cpp-6 gcc-6-base gcc-8-base libasan3 libgcc-6-dev libmpx2; do # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ # done - # fi + # fi + - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From b43e463c8e860ff64c3afecc051911a21468c9af Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:44:03 -0400 Subject: [PATCH 64/68] [SOFT-438] test --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e64ad820..6361ed648 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -98,7 +98,6 @@ jobs: # dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/gcc/ # done # fi - - name: Install clang if: steps.cache-clang.outputs.cache-hit != 'true' From 06e3b8839be900aec805c9d7601c5cce9067d890 Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:45:32 -0400 Subject: [PATCH 65/68] [SOFT-438] test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6361ed648..3f279fe20 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,8 +82,8 @@ jobs: sudo apt-get update - name: Install gcc - if: steps.cache-gcc-6.outputs.cache-hit != 'true' - run: sudo apt-fast -y install gcc-6 + if: steps.cache-gcc-6.outputs.cache-hit != 'true' + run: sudo apt-fast -y install gcc-6 # - name: Install gcc # env: From d696c69e02b9d333209ef103bd516428d9082e68 Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:56:34 -0400 Subject: [PATCH 66/68] [SOFT-438] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f279fe20..3069e7a2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: sudo apt-get update - name: Install gcc - if: steps.cache-gcc-6.outputs.cache-hit != 'true' + if: steps.cache-gcc.outputs.cache-hit != 'true' run: sudo apt-fast -y install gcc-6 # - name: Install gcc From c0ad42b70ba1439c199a6c8caaba844828db5d0b Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 16:44:39 -0400 Subject: [PATCH 67/68] [SOFT-438] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3069e7a2a..311388bdf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/cache@v2 id: cache-clang with: - path: /usr/bin/clang-5.0 + path: ../lib/llvm-5.0/bin/clang key: ${{ runner.os }}-clang - uses: actions/cache@v2 From 9f823a08f0949a09996bf628916fa6c780c3b96c Mon Sep 17 00:00:00 2001 From: Jackie Zhu <64090163+jckpokimain@users.noreply.github.com> Date: Tue, 28 Sep 2021 16:47:14 -0400 Subject: [PATCH 68/68] [SOFT-438] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 311388bdf..6b40132b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/cache@v2 id: cache-clang with: - path: ../lib/llvm-5.0/bin/clang + path: /usr/lib/llvm-5.0/bin/clang key: ${{ runner.os }}-clang - uses: actions/cache@v2