From 1ebe31160fd222e740e98728d21496786fc7cd54 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 15:22:48 +0100 Subject: [PATCH 01/22] Add GitHub actions --- .github/workflows/main.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..23d644e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,23 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + strategy: + matrix: + os: + - ubuntu-latest + - macOS-latest + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Build toolchain + run: | + ./build/build.sh From e743654ba0ecbf6d508580e423638208f27a6787 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 15:41:46 +0100 Subject: [PATCH 02/22] Install Ubuntu dependencies --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23d644e..77a221b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,12 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install Ubuntu dependencies + run: | + apt install flex + apt install bison + apt install makeinfo + if: matrix.os == ubuntu-latest - name: Build toolchain run: | ./build/build.sh From 25582e34d00a9a22e9d1275a4e223afef65aca3e Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 15:42:36 +0100 Subject: [PATCH 03/22] Correctly escape OS name --- .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 77a221b..7071d70 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: apt install flex apt install bison apt install makeinfo - if: matrix.os == ubuntu-latest + if: matrix.os == "ubuntu-latest" - name: Build toolchain run: | ./build/build.sh From 1d5fcbbdbd770019acbde67af981cf631f00547b Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 15:43:34 +0100 Subject: [PATCH 04/22] Use correct quotation marks --- .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 7071d70..f15a11c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: apt install flex apt install bison apt install makeinfo - if: matrix.os == "ubuntu-latest" + if: matrix.os == 'ubuntu-latest' - name: Build toolchain run: | ./build/build.sh From 6a334ccc416586a1194c806c35e6787959189ee0 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 15:45:16 +0100 Subject: [PATCH 05/22] Use sudo and apt-get to install dependencies --- .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 f15a11c..9654438 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,9 +20,9 @@ jobs: - uses: actions/checkout@v2 - name: Install Ubuntu dependencies run: | - apt install flex - apt install bison - apt install makeinfo + sudo apt-get install flex + sudo apt-get install bison + sudo apt-get install makeinfo if: matrix.os == 'ubuntu-latest' - name: Build toolchain run: | From 6731794f56096f5121d1ab54379f6cf828675785 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 15:50:39 +0100 Subject: [PATCH 06/22] Correct dependencies --- .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 9654438..bd3e239 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,9 +20,10 @@ jobs: - uses: actions/checkout@v2 - name: Install Ubuntu dependencies run: | + sudo apt-get install build-essential sudo apt-get install flex sudo apt-get install bison - sudo apt-get install makeinfo + sudo apt-get install texinfo if: matrix.os == 'ubuntu-latest' - name: Build toolchain run: | From 2dea6c98d15eec212f2c90e548fa742d37416c87 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 16:34:21 +0100 Subject: [PATCH 07/22] Increase build timeout --- .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 bd3e239..24c2330 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,14 +8,13 @@ on: jobs: build: + timeout-minutes: 120 strategy: matrix: os: - ubuntu-latest - macOS-latest - runs-on: ${{ matrix.os }} - steps: - uses: actions/checkout@v2 - name: Install Ubuntu dependencies From a3b6790d0879e7c73b76aa500c0dbbd03697f02b Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 16:36:53 +0100 Subject: [PATCH 08/22] Install macOS dependencies --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24c2330..5359692 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,6 +24,12 @@ jobs: sudo apt-get install bison sudo apt-get install texinfo if: matrix.os == 'ubuntu-latest' + - name: Install macOS dependencies + run: | + brew install flex + brew install bison + brew install texinfo + if: matrix.os == 'macOS-latest' - name: Build toolchain run: | ./build/build.sh From cf250d53e1c29a7bf5a9cbbecf43180ca047c701 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 17:41:40 +0100 Subject: [PATCH 09/22] Upload RSB build report --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5359692..f234406 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,3 +33,8 @@ jobs: - name: Build toolchain run: | ./build/build.sh + - name: Upload build result + uses: actions/upload-artifact@v1 + with: + name: log + path: rsb-report-*.txt From a2ae830cd2329d39ee6004424cbb129daca4b7a6 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Mon, 23 Mar 2020 18:04:31 +0100 Subject: [PATCH 10/22] Always upload build logs --- .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 f234406..48cbb1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,8 @@ jobs: run: | ./build/build.sh - name: Upload build result + if: always() uses: actions/upload-artifact@v1 with: name: log - path: rsb-report-*.txt + path: rtems-source-builder/rtems/rsb-report-*.txt From b5bddebd58795ffa66ceab3844c2f9f17dca6dcd Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Tue, 24 Mar 2020 09:55:59 +0100 Subject: [PATCH 11/22] Use new upload action with wildcards --- .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 48cbb1e..a74e1d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: ./build/build.sh - name: Upload build result if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2-preview with: name: log path: rtems-source-builder/rtems/rsb-report-*.txt From 6ca626aab41f3292cecf38fb0707a9cc5919c2aa Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Tue, 7 Apr 2020 15:49:10 +0200 Subject: [PATCH 12/22] Disable fail fast --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a74e1d6..70a9137 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,7 @@ jobs: build: timeout-minutes: 120 strategy: + fail-fast: false matrix: os: - ubuntu-latest From 83e325bec6f5e35fc11d52c577cf5a310499fce0 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Wed, 18 Aug 2021 12:46:50 +0200 Subject: [PATCH 13/22] Add manual workflow dispatch --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 70a9137..05a9df4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,7 @@ on: branches: [ master ] pull_request: branches: [ master ] + workflow_dispatch: jobs: build: From 88d9d1bb6ea0ae263248e4da521f445315d83281 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Wed, 18 Aug 2021 12:54:39 +0200 Subject: [PATCH 14/22] Add python2.7 header files on Ubuntu --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05a9df4..5fe0bdb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,6 +25,7 @@ jobs: sudo apt-get install flex sudo apt-get install bison sudo apt-get install texinfo + sudo apt-get install python2.7-dev if: matrix.os == 'ubuntu-latest' - name: Install macOS dependencies run: | From 669891239e8644e5a9f97f74d74099184e159618 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Wed, 18 Aug 2021 12:56:20 +0200 Subject: [PATCH 15/22] Install Python for macOS --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fe0bdb..669e99b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,7 @@ jobs: brew install flex brew install bison brew install texinfo + brew install python if: matrix.os == 'macOS-latest' - name: Build toolchain run: | From b666a070fb5b3f4026909ca28d4ebaa899ab7d95 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Wed, 18 Aug 2021 13:10:27 +0200 Subject: [PATCH 16/22] Add unique log names --- .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 669e99b..0fcda3a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,5 +41,5 @@ jobs: if: always() uses: actions/upload-artifact@v2-preview with: - name: log + name: log-${{ github.run_id }}-${{ runner.os }} path: rtems-source-builder/rtems/rsb-report-*.txt From 27fab67003288c66320ddab40799df81403d9b31 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Thu, 19 Aug 2021 10:11:31 +0200 Subject: [PATCH 17/22] Install Python with ASDF --- .github/workflows/main.yml | 14 ++++++++++---- .tool-versions | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .tool-versions diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0fcda3a..4b96e96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,25 +18,31 @@ jobs: - macOS-latest runs-on: ${{ matrix.os }} steps: + - uses: actions/checkout@v2 + - name: Install Ubuntu dependencies + if: matrix.os == 'ubuntu-latest' run: | sudo apt-get install build-essential sudo apt-get install flex sudo apt-get install bison sudo apt-get install texinfo - sudo apt-get install python2.7-dev - if: matrix.os == 'ubuntu-latest' + - name: Install macOS dependencies + if: matrix.os == 'macOS-latest' run: | brew install flex brew install bison brew install texinfo - brew install python - if: matrix.os == 'macOS-latest' + + - name: asdf_install + uses: asdf-vm/actions/install@v1 + - name: Build toolchain run: | ./build/build.sh + - name: Upload build result if: always() uses: actions/upload-artifact@v2-preview diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..95e5e2f --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +python 2.7.18 From a32412e996e984b33807c950a369adb21b96d6f0 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Thu, 19 Aug 2021 10:14:56 +0200 Subject: [PATCH 18/22] Add temporary test job --- .github/workflows/tmp.yml | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/tmp.yml diff --git a/.github/workflows/tmp.yml b/.github/workflows/tmp.yml new file mode 100644 index 0000000..f3ab3f8 --- /dev/null +++ b/.github/workflows/tmp.yml @@ -0,0 +1,45 @@ +name: TMP + +on: + workflow_dispatch: + +jobs: + build: + timeout-minutes: 120 + + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - macOS-latest + + runs-on: ${{ matrix.os }} + + steps: + + - uses: actions/checkout@v2 + + - name: Install Ubuntu dependencies + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt-get install build-essential + sudo apt-get install flex + sudo apt-get install bison + sudo apt-get install texinfo + + - name: Install macOS dependencies + if: matrix.os == 'macOS-latest' + run: | + brew install flex + brew install bison + brew install texinfo + + - name: asdf_install + uses: asdf-vm/actions/install@v1 + + - name: Test + run: | + which python + python --version + ls -lah ~/.asdf From b95f76c78517205735174575de0ab6ad3cbb147a Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Thu, 19 Aug 2021 10:22:54 +0200 Subject: [PATCH 19/22] Test hack to set library path for Python --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b96e96..4d13e36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,6 +41,7 @@ jobs: - name: Build toolchain run: | + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.asdf/installs/python/2.7.18/lib ./build/build.sh - name: Upload build result From 0b8bbb1323e701d45fd2c8079945c520816ba220 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Thu, 19 Aug 2021 10:25:43 +0200 Subject: [PATCH 20/22] Rename TMP job --- .github/workflows/tmp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tmp.yml b/.github/workflows/tmp.yml index f3ab3f8..cc38a11 100644 --- a/.github/workflows/tmp.yml +++ b/.github/workflows/tmp.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: - build: + tmp: timeout-minutes: 120 strategy: From 75a736ecb920fdbbaed69affc1a787effe5693a6 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Thu, 19 Aug 2021 10:27:12 +0200 Subject: [PATCH 21/22] Run TMP job on push --- .github/workflows/tmp.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tmp.yml b/.github/workflows/tmp.yml index cc38a11..2976013 100644 --- a/.github/workflows/tmp.yml +++ b/.github/workflows/tmp.yml @@ -1,7 +1,8 @@ name: TMP on: - workflow_dispatch: + - push + - workflow_dispatch jobs: tmp: From cddce746bf7304661f1e0c09d60f2ccb06123e83 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Thu, 19 Aug 2021 10:42:06 +0200 Subject: [PATCH 22/22] Export LD_LIBRARY_PATH in the correct way --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d13e36..b137d51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,9 +39,13 @@ jobs: - name: asdf_install uses: asdf-vm/actions/install@v1 + - name: Set LD_LIBRARY_PATH + if: matrix.os == 'ubuntu-latest' + run: | + echo "LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}:${{ env.ASDF_DATA_DIR }}/installs/python/2.7.18/lib" >> $GITHUB_ENV + - name: Build toolchain run: | - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.asdf/installs/python/2.7.18/lib ./build/build.sh - name: Upload build result