From 445b5cecb267adcd556627ffea2486b20740d6d4 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Mon, 1 Feb 2021 12:44:24 -0800 Subject: Bump to Scala 2.12.13 (#1766) --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f9c2b2b0..a9322492 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - scala: [2.12.12] + scala: [2.12.13] container: image: ucbbar/chisel3-tools options: --user github --entrypoint /bin/bash @@ -32,7 +32,7 @@ jobs: - name: Cache Scala uses: coursier/cache-action@v5 - name: Documentation (Scala 2.12 only) - if: matrix.scala == '2.12.12' + if: matrix.scala == '2.12.13' run: sbt ++${{ matrix.scala }} docs/mdoc - name: Test run: sbt ++${{ matrix.scala }} test -- cgit v1.2.3 From 53b620478ddab1faa96512e473fa198f7f1fcf50 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 9 Feb 2021 17:12:37 -0800 Subject: Add no-plugin-tests for testing Chisel without the compiler plugin This is a new SBT build unit that symlinks in some files from the normal chisel project tests, but builds them without the compiler plugin. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9322492..6d9fe475 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: if: matrix.scala == '2.12.13' run: sbt ++${{ matrix.scala }} docs/mdoc - name: Test - run: sbt ++${{ matrix.scala }} test + run: sbt ++${{ matrix.scala }} test noPluginTests/test - name: Binary compatibility run: sbt ++${{ matrix.scala }} mimaReportBinaryIssues -- cgit v1.2.3 From c5861176887bfa529277e686df09a42aeceb6cd7 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Thu, 29 Apr 2021 16:18:06 -0700 Subject: Scala 2.13 support (#1751) --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d9fe475..5d321bfa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - scala: [2.12.13] + scala: [2.13.5, 2.12.13] container: image: ucbbar/chisel3-tools options: --user github --entrypoint /bin/bash -- cgit v1.2.3 From 5c35e17b142cd76f3ff333eb0edf05c2e8f79cfd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 17 May 2021 17:37:32 +0200 Subject: Update scala-compiler, scala-library, ... to 2.13.6 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d321bfa..6c7f14cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - scala: [2.13.5, 2.12.13] + scala: [2.13.6, 2.12.13] container: image: ucbbar/chisel3-tools options: --user github --entrypoint /bin/bash -- cgit v1.2.3 From ea7630bf12f8da0a4150386b95539a177940bd68 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Sun, 4 Jul 2021 12:51:25 +0800 Subject: refactor github action --- .github/workflows/test.yml | 63 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 9 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6c7f14cc..b365776f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,17 +12,62 @@ on: jobs: ci: name: ci - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: - scala: [2.13.6, 2.12.13] - container: - image: ucbbar/chisel3-tools - options: --user github --entrypoint /bin/bash - env: - CONTAINER_HOME: /home/github + scala: ["2.13.6", "2.12.13"] + verilator: ["4.204"] + z3: ["4.8.10"] steps: + - name: Install Z3 Build Dependencies + run: sudo apt-get install -y git make autoconf g++ flex bison libfl2 libfl-dev + + - name: Cache Z3 ${{ matrix.z3 }} + uses: actions/cache@v2 + id: cache-z3 + with: + path: z3-z3-${{ matrix.z3 }} + key: ${{ runner.os }}-z3-${{ matrix.z3 }} + - name: Compile Z3 + if: steps.cache-z3.outputs.cache-hit != 'true' + run: | + wget https://github.com/Z3Prover/z3/archive/refs/tags/z3-${{ matrix.z3 }}.tar.gz + tar xvf z3-${{ matrix.z3 }}.tar.gz + cd z3-z3-${{ matrix.z3 }} + mkdir -p build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DZ3_LINK_TIME_OPTIMIZATION=1 + make + - name: Install Z3 ${{ matrix.z3 }} + run: | + cd z3-z3-${{ matrix.z3 }}/build + sudo make install + z3 --version + + - name: Cache Verilator ${{ matrix.verilator }} + uses: actions/cache@v2 + id: cache-verilator + with: + path: verilator-${{ matrix.verilator }} + key: ${{ runner.os }}-verilator-${{ matrix.verilator }} + - name: Compile Verilator ${{ matrix.verilator }} + if: steps.cache-verilator.outputs.cache-hit != 'true' + run: | + wget https://github.com/verilator/verilator/archive/refs/tags/v${{ matrix.verilator }}.tar.gz + tar xvf v${{ matrix.verilator }}.tar.gz + cd verilator-${{ matrix.verilator }} + autoconf + ./configure + make + - name: Install Verilator ${{ matrix.verilator }} + run: | + cd verilator-${{ matrix.verilator }} + sudo make install + verilator --version + - name: Checkout uses: actions/checkout@v2 - name: Setup Scala @@ -46,7 +91,7 @@ jobs: all_tests_passed: name: "all tests passed" needs: [ci] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - run: echo Success! @@ -54,7 +99,7 @@ jobs: # separate from a Scala versions build matrix to avoid duplicate publishing publish: needs: [all_tests_passed] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: github.event_name == 'push' steps: -- cgit v1.2.3 From fabbd209a964d1573bf9371adbaa8373cba8e55e Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Tue, 13 Jul 2021 10:51:48 +0800 Subject: fix ci, add more matrix. --- .github/workflows/test.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b365776f..6d68ad1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,23 +12,29 @@ on: jobs: ci: name: ci - runs-on: ubuntu-20.04 strategy: matrix: + system: ["ubuntu-20.04"] + jvm: ["adopt@1.8"] scala: ["2.13.6", "2.12.13"] verilator: ["4.204"] z3: ["4.8.10"] + runs-on: ${{ matrix.system }} steps: - - name: Install Z3 Build Dependencies - run: sudo apt-get install -y git make autoconf g++ flex bison libfl2 libfl-dev + - name: Checkout + uses: actions/checkout@v2 + + - name: Install Z3 Build Dependencies(Ubuntu) + if: matrix.system == 'ubuntu-20.04' + run: sudo apt-get install -y libfl2 libfl-dev - name: Cache Z3 ${{ matrix.z3 }} uses: actions/cache@v2 id: cache-z3 with: path: z3-z3-${{ matrix.z3 }} - key: ${{ runner.os }}-z3-${{ matrix.z3 }} + key: ${{ matrix.system }}-z3-${{ matrix.z3 }} - name: Compile Z3 if: steps.cache-z3.outputs.cache-hit != 'true' run: | @@ -52,7 +58,7 @@ jobs: id: cache-verilator with: path: verilator-${{ matrix.verilator }} - key: ${{ runner.os }}-verilator-${{ matrix.verilator }} + key: ${{ matrix.system }}-verilator-${{ matrix.verilator }} - name: Compile Verilator ${{ matrix.verilator }} if: steps.cache-verilator.outputs.cache-hit != 'true' run: | @@ -68,12 +74,10 @@ jobs: sudo make install verilator --version - - name: Checkout - uses: actions/checkout@v2 - name: Setup Scala uses: olafurpg/setup-scala@v10 with: - java-version: adopt@1.8 + java-version: ${{ matrix.jvm }} - name: Cache Scala uses: coursier/cache-action@v5 - name: Documentation (Scala 2.12 only) -- cgit v1.2.3 From 695864f5716626a15a7798dae048d8301940a2db Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 15 Jul 2021 02:32:06 +0800 Subject: Espresso Decoder (#1964) Co-authored-by: Haoran Yuan Co-authored-by: Boyang Han --- .github/workflows/test.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d68ad1a..b2620d2f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,7 @@ jobs: scala: ["2.13.6", "2.12.13"] verilator: ["4.204"] z3: ["4.8.10"] + espresso: ["2.4"] runs-on: ${{ matrix.system }} steps: @@ -74,6 +75,28 @@ jobs: sudo make install verilator --version + - name: Cache Espresso ${{ matrix.espresso }} + uses: actions/cache@v2 + id: cache-espresso + with: + path: espresso-${{ matrix.espresso }} + key: ${{ matrix.system }}-espresso-${{ matrix.espresso }} + - name: Compile Espresso ${{ matrix.espresso }} + if: steps.cache-espresso.outputs.cache-hit != 'true' + run: | + wget https://github.com/chipsalliance/espresso/archive/refs/tags/v${{ matrix.espresso }}.tar.gz + tar xvf v${{ matrix.espresso }}.tar.gz + cd espresso-${{ matrix.espresso }} + mkdir -p build + cd build + cmake .. + make + - name: Install Espresso ${{ matrix.espresso }} + run: | + cd espresso-${{ matrix.espresso }}/build + sudo make install + + - name: Setup Scala uses: olafurpg/setup-scala@v10 with: -- cgit v1.2.3 From 1e7829eb674eed85a4cd537896d9fd9ee0bc5ff4 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 28 Jul 2021 19:35:27 -0700 Subject: Just install z3 from apt-get in CI (#2056) --- .github/workflows/test.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2620d2f..f5a1f811 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: jvm: ["adopt@1.8"] scala: ["2.13.6", "2.12.13"] verilator: ["4.204"] - z3: ["4.8.10"] espresso: ["2.4"] runs-on: ${{ matrix.system }} @@ -26,32 +25,10 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Z3 Build Dependencies(Ubuntu) + - name: Install Z3 if: matrix.system == 'ubuntu-20.04' - run: sudo apt-get install -y libfl2 libfl-dev - - - name: Cache Z3 ${{ matrix.z3 }} - uses: actions/cache@v2 - id: cache-z3 - with: - path: z3-z3-${{ matrix.z3 }} - key: ${{ matrix.system }}-z3-${{ matrix.z3 }} - - name: Compile Z3 - if: steps.cache-z3.outputs.cache-hit != 'true' - run: | - wget https://github.com/Z3Prover/z3/archive/refs/tags/z3-${{ matrix.z3 }}.tar.gz - tar xvf z3-${{ matrix.z3 }}.tar.gz - cd z3-z3-${{ matrix.z3 }} - mkdir -p build - cd build - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DZ3_LINK_TIME_OPTIMIZATION=1 - make - - name: Install Z3 ${{ matrix.z3 }} run: | - cd z3-z3-${{ matrix.z3 }}/build - sudo make install + sudo apt-get install -y z3 z3 --version - name: Cache Verilator ${{ matrix.verilator }} -- cgit v1.2.3 From 5f550b606d47d04b7ee60976cdb18a51c391992c Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 29 Jul 2021 10:55:52 +0800 Subject: Revert "Just install z3 from apt-get in CI (#2056)" This reverts commit 1e7829eb674eed85a4cd537896d9fd9ee0bc5ff4. --- .github/workflows/test.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f5a1f811..b2620d2f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,7 @@ jobs: jvm: ["adopt@1.8"] scala: ["2.13.6", "2.12.13"] verilator: ["4.204"] + z3: ["4.8.10"] espresso: ["2.4"] runs-on: ${{ matrix.system }} @@ -25,10 +26,32 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Z3 + - name: Install Z3 Build Dependencies(Ubuntu) if: matrix.system == 'ubuntu-20.04' + run: sudo apt-get install -y libfl2 libfl-dev + + - name: Cache Z3 ${{ matrix.z3 }} + uses: actions/cache@v2 + id: cache-z3 + with: + path: z3-z3-${{ matrix.z3 }} + key: ${{ matrix.system }}-z3-${{ matrix.z3 }} + - name: Compile Z3 + if: steps.cache-z3.outputs.cache-hit != 'true' + run: | + wget https://github.com/Z3Prover/z3/archive/refs/tags/z3-${{ matrix.z3 }}.tar.gz + tar xvf z3-${{ matrix.z3 }}.tar.gz + cd z3-z3-${{ matrix.z3 }} + mkdir -p build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DZ3_LINK_TIME_OPTIMIZATION=1 + make + - name: Install Z3 ${{ matrix.z3 }} run: | - sudo apt-get install -y z3 + cd z3-z3-${{ matrix.z3 }}/build + sudo make install z3 --version - name: Cache Verilator ${{ matrix.verilator }} -- cgit v1.2.3 From 886d60ca6412a017ad345e3ce346eefe383c4a7e Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 29 Jul 2021 11:06:15 +0800 Subject: switch to ninja --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2620d2f..94a30f12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,13 +45,14 @@ jobs: mkdir -p build cd build cmake .. \ + -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DZ3_LINK_TIME_OPTIMIZATION=1 - make + ninja - name: Install Z3 ${{ matrix.z3 }} run: | cd z3-z3-${{ matrix.z3 }}/build - sudo make install + sudo ninja install z3 --version - name: Cache Verilator ${{ matrix.verilator }} -- cgit v1.2.3 From b940d9f83f87567fe69c068a1faf63fd8d3bf091 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 29 Jul 2021 11:08:02 +0800 Subject: apt install ninja --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94a30f12..10742b96 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - name: Install Z3 Build Dependencies(Ubuntu) if: matrix.system == 'ubuntu-20.04' - run: sudo apt-get install -y libfl2 libfl-dev + run: sudo apt-get install -y libfl2 libfl-dev ninja-build - name: Cache Z3 ${{ matrix.z3 }} uses: actions/cache@v2 -- cgit v1.2.3 From 0952a6ecf0811663f21379371707abc679a9cea4 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 29 Jul 2021 11:16:55 +0800 Subject: don't hit cache --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 10742b96..dca07648 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: id: cache-z3 with: path: z3-z3-${{ matrix.z3 }} - key: ${{ matrix.system }}-z3-${{ matrix.z3 }} + key: ${{ matrix.system }}-z3-ninja-${{ matrix.z3 }} - name: Compile Z3 if: steps.cache-z3.outputs.cache-hit != 'true' run: | -- cgit v1.2.3 From bc963e741df2f949c236db65aa51b686abdd41a1 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 29 Jul 2021 12:14:27 +0800 Subject: timestamp seems to be fixed in actions/cache#397 --- .github/workflows/test.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dca07648..22a04c35 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: run: sudo apt-get install -y libfl2 libfl-dev ninja-build - name: Cache Z3 ${{ matrix.z3 }} - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 id: cache-z3 with: path: z3-z3-${{ matrix.z3 }} @@ -56,7 +56,7 @@ jobs: z3 --version - name: Cache Verilator ${{ matrix.verilator }} - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 id: cache-verilator with: path: verilator-${{ matrix.verilator }} @@ -77,7 +77,7 @@ jobs: verilator --version - name: Cache Espresso ${{ matrix.espresso }} - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 id: cache-espresso with: path: espresso-${{ matrix.espresso }} @@ -97,7 +97,6 @@ jobs: cd espresso-${{ matrix.espresso }}/build sudo make install - - name: Setup Scala uses: olafurpg/setup-scala@v10 with: -- cgit v1.2.3 From 42f1363c1956976cad62a68c3f34f57941b08003 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Wed, 18 Aug 2021 12:59:59 +0800 Subject: switch espresso to ninja. --- .github/workflows/test.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22a04c35..3438dcf9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DZ3_LINK_TIME_OPTIMIZATION=1 - ninja + ninja - name: Install Z3 ${{ matrix.z3 }} run: | cd z3-z3-${{ matrix.z3 }}/build @@ -81,7 +81,7 @@ jobs: id: cache-espresso with: path: espresso-${{ matrix.espresso }} - key: ${{ matrix.system }}-espresso-${{ matrix.espresso }} + key: ${{ matrix.system }}-espresso-ninja-${{ matrix.espresso }} - name: Compile Espresso ${{ matrix.espresso }} if: steps.cache-espresso.outputs.cache-hit != 'true' run: | @@ -90,12 +90,14 @@ jobs: cd espresso-${{ matrix.espresso }} mkdir -p build cd build - cmake .. - make + cmake .. \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release + ninja - name: Install Espresso ${{ matrix.espresso }} run: | cd espresso-${{ matrix.espresso }}/build - sudo make install + sudo ninja install - name: Setup Scala uses: olafurpg/setup-scala@v10 -- cgit v1.2.3 From 3840fec3d918f23df07a18311136ac6a1bc365e1 Mon Sep 17 00:00:00 2001 From: Kevin Laeufer Date: Wed, 25 Aug 2021 12:38:56 -0700 Subject: replace custom model checker with chiseltest formal verify command (#2075) * replace custom model checker with chiseltest formal verify command * integration-tests can make use of chiseltest This is a compromise solution to avoid issues with binary compatibility breaking changes in chisel3. * ci: move integration tests into separate job * run integration tests only for one scala version * ci: install espresso for integration tests * Update build.sbt Co-authored-by: Jack Koenig Co-authored-by: Jack Koenig --- .github/workflows/test.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3438dcf9..a2240ff8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -113,13 +113,40 @@ jobs: - name: Binary compatibility run: sbt ++${{ matrix.scala }} mimaReportBinaryIssues + integration: + name: Integration Tests (w/ chiseltest) + runs-on: ubuntu-20.04 + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Install Verilator and Z3 + run: | + sudo apt-get install -y verilator z3 + verilator --version + z3 --version + - name: Install Espresso + run: | + cd /tmp + wget https://github.com/chipsalliance/espresso/releases/download/v2.4/x86_64-linux-gnu-espresso + chmod +x x86_64-linux-gnu-espresso + sudo mv x86_64-linux-gnu-espresso /usr/local/bin/espresso + espresso || true + - name: Setup Scala + uses: olafurpg/setup-scala@v10 + with: + java-version: "adopt@1.11" + - name: Cache Scala + uses: coursier/cache-action@v5 + - name: Integration Tests + run: sbt integrationTests/test + # Sentinel job to simplify how we specify which checks need to pass in branch # protection and in Mergify # # When adding new jobs, please add them to `needs` below all_tests_passed: name: "all tests passed" - needs: [ci] + needs: [ci, integration] runs-on: ubuntu-20.04 steps: - run: echo Success! -- cgit v1.2.3 From c66f0ed24366f8ce0e20a5a420589b8ae01aba77 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Sep 2021 00:50:37 +0200 Subject: Update scala-compiler, scala-library, ... to 2.12.14 (#1950) --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2240ff8..c6ca69fd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: matrix: system: ["ubuntu-20.04"] jvm: ["adopt@1.8"] - scala: ["2.13.6", "2.12.13"] + scala: ["2.13.6", "2.12.14"] verilator: ["4.204"] z3: ["4.8.10"] espresso: ["2.4"] @@ -106,7 +106,7 @@ jobs: - name: Cache Scala uses: coursier/cache-action@v5 - name: Documentation (Scala 2.12 only) - if: matrix.scala == '2.12.13' + if: matrix.scala == '2.12.14' run: sbt ++${{ matrix.scala }} docs/mdoc - name: Test run: sbt ++${{ matrix.scala }} test noPluginTests/test -- cgit v1.2.3 From a692b6d230189191defff45c85bc15ce705c471c Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Fri, 17 Sep 2021 12:18:11 -0700 Subject: Just install Z3 from apt-get in CI (#2131) Also install Espresso from pre-built binary--- .github/workflows/test.yml | 55 +++++++--------------------------------------- 1 file changed, 8 insertions(+), 47 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c6ca69fd..48300189 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: jvm: ["adopt@1.8"] scala: ["2.13.6", "2.12.14"] verilator: ["4.204"] - z3: ["4.8.10"] espresso: ["2.4"] runs-on: ${{ matrix.system }} @@ -26,33 +25,10 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Z3 Build Dependencies(Ubuntu) + - name: Install Z3 if: matrix.system == 'ubuntu-20.04' - run: sudo apt-get install -y libfl2 libfl-dev ninja-build - - - name: Cache Z3 ${{ matrix.z3 }} - uses: actions/cache@v2.1.6 - id: cache-z3 - with: - path: z3-z3-${{ matrix.z3 }} - key: ${{ matrix.system }}-z3-ninja-${{ matrix.z3 }} - - name: Compile Z3 - if: steps.cache-z3.outputs.cache-hit != 'true' run: | - wget https://github.com/Z3Prover/z3/archive/refs/tags/z3-${{ matrix.z3 }}.tar.gz - tar xvf z3-${{ matrix.z3 }}.tar.gz - cd z3-z3-${{ matrix.z3 }} - mkdir -p build - cd build - cmake .. \ - -GNinja \ - -DCMAKE_BUILD_TYPE=Release \ - -DZ3_LINK_TIME_OPTIMIZATION=1 - ninja - - name: Install Z3 ${{ matrix.z3 }} - run: | - cd z3-z3-${{ matrix.z3 }}/build - sudo ninja install + sudo apt-get install -y z3 z3 --version - name: Cache Verilator ${{ matrix.verilator }} @@ -76,28 +52,13 @@ jobs: sudo make install verilator --version - - name: Cache Espresso ${{ matrix.espresso }} - uses: actions/cache@v2.1.6 - id: cache-espresso - with: - path: espresso-${{ matrix.espresso }} - key: ${{ matrix.system }}-espresso-ninja-${{ matrix.espresso }} - - name: Compile Espresso ${{ matrix.espresso }} - if: steps.cache-espresso.outputs.cache-hit != 'true' - run: | - wget https://github.com/chipsalliance/espresso/archive/refs/tags/v${{ matrix.espresso }}.tar.gz - tar xvf v${{ matrix.espresso }}.tar.gz - cd espresso-${{ matrix.espresso }} - mkdir -p build - cd build - cmake .. \ - -GNinja \ - -DCMAKE_BUILD_TYPE=Release - ninja - - name: Install Espresso ${{ matrix.espresso }} + - name: Install Espresso run: | - cd espresso-${{ matrix.espresso }}/build - sudo ninja install + cd /tmp + wget https://github.com/chipsalliance/espresso/releases/download/v${{ matrix.espresso }}/x86_64-linux-gnu-espresso + chmod +x x86_64-linux-gnu-espresso + sudo mv x86_64-linux-gnu-espresso /usr/local/bin/espresso + espresso || true - name: Setup Scala uses: olafurpg/setup-scala@v10 -- cgit v1.2.3 From 958904cb2f2f65d02b2ab3ec6d9ec2e06d04e482 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Fri, 17 Sep 2021 13:15:34 -0700 Subject: Update Scala and publish plugin for more minor versions (#2130) --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 48300189..abce6d13 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: matrix: system: ["ubuntu-20.04"] jvm: ["adopt@1.8"] - scala: ["2.13.6", "2.12.14"] + scala: ["2.13.6", "2.12.15"] verilator: ["4.204"] espresso: ["2.4"] runs-on: ${{ matrix.system }} @@ -67,7 +67,7 @@ jobs: - name: Cache Scala uses: coursier/cache-action@v5 - name: Documentation (Scala 2.12 only) - if: matrix.scala == '2.12.14' + if: startsWith(matrix.scala, '2.12') run: sbt ++${{ matrix.scala }} docs/mdoc - name: Test run: sbt ++${{ matrix.scala }} test noPluginTests/test -- cgit v1.2.3