Iterate on deb builds, port changes to Dockerfile

SigmaGmbH · Nov 10, 2023 · 5dd765d · 5dd765d
1 parent 7d36f15
commit 5dd765d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SGX_MODE: HW
+      VERSION: 1.0.1
     steps:
       - uses: actions/checkout@v3
         with:
@@ -23,11 +24,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get the version
-        id: get_version
-        run: |
-          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-          echo "::set-output name=VERSION::$(git rev-parse --short HEAD)"
+#      - name: Get the version
+#        id: get_version
+#        run: |
+#          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+#          echo "::set-output name=VERSION::$(git rev-parse --short HEAD)"
 
       - name: Build .deb Package Image
         uses: docker/build-push-action@v4
@@ -43,9 +44,9 @@ jobs:
           target: build-deb
       - name: Run .deb Package Image
         run: |
-          docker run -e VERSION=1.0.0 -v $GITHUB_WORKSPACE/build:/build deb_build
-          cp build/swisstronik_1.0.0_amd64.deb swisstronik_1.0.0_amd64.deb
+          docker run -e VERSION=${{ VERSION }} -v $GITHUB_WORKSPACE/build:/build deb_build
+          cp build/swisstronik_${{ VERSION }}_amd64.deb swisstronik_${{VERSION}}_amd64.deb
       - uses: actions/upload-artifact@v3
         with:
-          name: swisstronik_1.0.0_amd64.deb
-          path: swisstronik_1.0.0_amd64.deb
+          name: swisstronik_${{ VERSION }}_amd64.deb
+          path: swisstronik_${{ VERSION }}_amd64.deb
diff --git a/docker/node.Dockerfile b/docker/node.Dockerfile
@@ -57,7 +57,7 @@ WORKDIR /root
 # Copy over binaries from the build-env
 COPY --from=compile-chain /root/chain/build/swisstronikd swisstronikd
 COPY --from=compile-chain /root/.swisstronik-enclave /usr/lib/.swisstronik-enclave
-COPY --from=compile-chain /root/chain/external/evm-module/librustgo/internal/api/libsgx_wrapper.x86_64.so /usr/lib/.swisstronik-enclave/libsgx_wrapper.x86_64.so
+COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper.x86_64.so /usr/lib/.swisstronik-enclave/libsgx_wrapper.x86_64.so
 
 COPY ./deb ./deb
 COPY ./scripts/build_deb.sh .