Merge branch 'main' into komarevskiy/ic-gateway-add-retries

dfinity · Aug 15, 2024 · d3a53da · d3a53da
2 parents 095bd14 + 8219493
commit d3a53da
Show file tree

Hide file tree

Showing 12 changed files with 491 additions and 739 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 name: Release
 
-on: 
+on:
   push:
     tags:
-    - 'v*'
+      - "v*"
 
 env:
   CARGO_TERM_COLOR: never
@@ -16,60 +16,60 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Install repro-env
-      run: |
-        wget 'https://github.com/kpcyrd/repro-env/releases/download/v0.4.0/repro-env'
-        echo 'e331825a19d41a5ad4dd7c1ce7a810eccbb9eb8945c3fc78abe9f040df8c1204  repro-env' | sha256sum -c -
-        sudo install -m755 repro-env -t /usr/bin
-
-    - name: Install deps
-      run: sudo apt-get update && sudo apt-get -y install protobuf-compiler podman
-
-    - name: Build
-      run: repro-env build -- cargo build --release --target x86_64-unknown-linux-musl
-
-    - name: Generate SHA checksum
-      run: shasum target/x86_64-unknown-linux-musl/release/ic-gateway > ic-gateway.shasum
-
-    - name: Remove build files
-      run: rm -rf target
-
-    - name: Build again
-      run: repro-env build -- cargo build --release --target x86_64-unknown-linux-musl
-    
-    - name: Check SHA checksum
-      run: shasum -c ic-gateway.shasum
-
-    - name: Strip
-      run: /usr/bin/strip target/x86_64-unknown-linux-musl/release/ic-gateway
-
-    - name: Create package root
-      run: |
-        mkdir -p .debpkg/usr/sbin
-        mkdir -p .debpkg/etc/systemd/system
-        mkdir -p .debpkg/etc/default
-        mkdir -p .debpkg/DEBIAN
-
-        cp target/x86_64-unknown-linux-musl/release/ic-gateway .debpkg/usr/sbin
-        cp deploy/ic-gateway.service .debpkg/etc/systemd/system
-        cp deploy/ic-gateway.env .debpkg/etc/default/ic-gateway
-
-        chmod -R g-s .debpkg
-
-    - uses: jiro4989/build-deb-action@v3
-      with:
-        package: ic-gateway
-        package_root: .debpkg
-        maintainer: "DFINITY Boundary Nodes Team"
-        version: ${{ github.ref }}
-        arch: amd64
-        desc: "IC-Gateway Service"
-        homepage: "https://github.com/dfinity/ic-gateway"
-
-    - uses: ncipollo/release-action@v1
-      with:
-        makeLatest: true
-        artifacts: "target/x86_64-unknown-linux-musl/release/ic-gateway,*.deb"
-        body: "IC-Gateway release"
+      - uses: actions/checkout@v4
+
+      - name: Install repro-env
+        run: |
+          wget 'https://github.com/kpcyrd/repro-env/releases/download/v0.4.0/repro-env'
+          echo 'e331825a19d41a5ad4dd7c1ce7a810eccbb9eb8945c3fc78abe9f040df8c1204  repro-env' | sha256sum -c -
+          sudo install -m755 repro-env -t /usr/bin
+
+      - name: Install deps
+        run: sudo apt-get update && sudo apt-get -y install protobuf-compiler podman
+
+      - name: Build
+        run: repro-env build -- cargo build --release --target x86_64-unknown-linux-musl
+
+      - name: Generate SHA checksum
+        run: shasum target/x86_64-unknown-linux-musl/release/ic-gateway > ic-gateway.shasum
+
+      - name: Remove build files
+        run: rm -rf target
+
+      - name: Build again
+        run: repro-env build -- cargo build --release --target x86_64-unknown-linux-musl
+
+      - name: Check SHA checksum
+        run: shasum -c ic-gateway.shasum
+
+      - name: Strip
+        run: /usr/bin/strip target/x86_64-unknown-linux-musl/release/ic-gateway
+
+      - name: Create package root
+        run: |
+          mkdir -p .debpkg/usr/sbin
+          mkdir -p .debpkg/etc/systemd/system
+          mkdir -p .debpkg/etc/default
+          mkdir -p .debpkg/DEBIAN
+
+          cp target/x86_64-unknown-linux-musl/release/ic-gateway .debpkg/usr/sbin
+          cp deploy/ic-gateway.service .debpkg/etc/systemd/system
+          cp deploy/ic-gateway.env .debpkg/etc/default/ic-gateway
+
+          chmod -R g-s .debpkg
+
+      - uses: jiro4989/build-deb-action@1bd8ed1458d3dc331f62bf50468cce9b610fd0af
+        with:
+          package: ic-gateway
+          package_root: .debpkg
+          maintainer: "DFINITY Boundary Nodes Team"
+          version: ${{ github.ref }}
+          arch: amd64
+          desc: "IC-Gateway Service"
+          homepage: "https://github.com/dfinity/ic-gateway"
+
+      - uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5
+        with:
+          makeLatest: true
+          artifacts: "target/x86_64-unknown-linux-musl/release/ic-gateway,*.deb"
+          body: "IC-Gateway release"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,9 +2,9 @@ name: Test
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: never
@@ -13,15 +13,15 @@ jobs:
   test:
     runs-on: dind-small
     container:
-      image: ghcr.io/catthehacker/ubuntu:rust-22.04
+      image: ghcr.io/catthehacker/ubuntu:rust-22.04@sha256:baeacfa8e05a4402c2e17d8a495dadbb7a6062a8ae44eef7c22424d617c53373
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
 
-    - name: Install protoc
-      run: sudo apt-get update && sudo apt-get -y install protobuf-compiler
+      - name: Install protoc
+        run: sudo apt-get update && sudo apt-get -y install protobuf-compiler
 
-    - name: Run tests
-      run: cargo test
+      - name: Run tests
+        run: cargo test