feat!: Update toolchain to 0.15.0

cartesi · Aug 11, 2023 · 7ea9113 · 7ea9113
1 parent 3471e55
commit 7ea9113
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 384 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,16 +1,15 @@
 name: Build
 on: [push]
 env:
-  TOOLCHAIN_IMAGE: ${{ secrets.DOCKER_ORGANIZATION }}/toolchain
-  TOOLCHAIN_TAG: 0.14.0
+  TOOLCHAIN_IMAGE: ghcr.io/${{ github.repository_owner }}/toolchain
+  TOOLCHAIN_TAG: feature-bump-gcc
 jobs:
   tools:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-          token: ${{ secrets.CI_TOKEN }}
 
       - name: Login to GHCR
         uses: docker/login-action@v2
@@ -19,6 +18,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Export makefile variables
         run: make env >> $GITHUB_ENV
 
@@ -28,18 +33,16 @@ jobs:
       - name: Buildx setup
         uses: docker/setup-buildx-action@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: ${{ secrets.DOCKER_ORGANIZATION }}/machine-emulator-tools
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
+
       - name: Build [${{ env.MACHINE_EMULATOR_TOOLS_TAR_GZ }}]
         id: docker_build
         uses: docker/build-push-action@v4
@@ -86,13 +89,19 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-          token: ${{ secrets.CI_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/linux/htif/Makefile b/linux/htif/Makefile
@@ -16,8 +16,8 @@
 
 UNAME:=$(shell uname)
 
-TOOLCHAIN_IMAGE ?= cartesi/toolchain
-TOOLCHAIN_TAG ?= 0.14.0
+TOOLCHAIN_IMAGE ?= ghcr.io/cartesi/toolchain
+TOOLCHAIN_TAG ?= feature-bump-gcc
 RISCV_ARCH ?= rv64gc
 RISCV_ABI ?= lp64d