Merge branch 'main' into sidecar-node_util-functions

Author: sacherjj

.github/workflows/casper-node-launcher-publish.yml

@@ -1,72 +1,5 @@
 ---
 name: publish-casper-node-launcher
-
-on:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  publish_deb:
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-20.04
-            code_name: focal
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2
-
-      - name: Install deps
-        run: |
-          echo "deb http://repo.aptly.info/ squeeze main" | sudo tee -a /etc/apt/sources.list.d/aptly.list
-          wget -qO - https://www.aptly.info/pubkey.txt | sudo apt-key add -
-          sudo apt-get update
-          sudo apt-get install -y aptly=1.4.0
-          aptly config show
-
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@c8bb57c57e8df1be8c73ff3d59deab1dbc00e0d1 #v5.1.0
-        with:
-          gpg_private_key: ${{ secrets.APTLY_GPG_KEY }}
-          passphrase: ${{ secrets.APTLY_GPG_PASS }}
-
-      - name: Install cargo deb
-        run: cargo install cargo-deb
-
-      - name: Cargo build
-        run: cargo build --release
-
-      - name: Cargo deb
-        run: cargo deb --no-build --variant ${{ matrix.code_name }}
-
-      - name: Upload binaries to repo
-        env:
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.APTLY_SECRET_KEY }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.APTLY_ACCESS_KEY }}
-          PLUGIN_REPO_NAME: ${{ secrets.APTLY_REPO }}
-          PLUGIN_REGION: ${{ secrets.APTLY_REGION }}
-          PLUGIN_GPG_KEY: ${{ secrets.APTLY_GPG_KEY }}
-          PLUGIN_GPG_PASS: ${{ secrets.APTLY_GPG_PASS }}
-          PLUGIN_ACL: 'public-read'
-          PLUGIN_PREFIX: 'releases'
-          PLUGIN_DEB_PATH: './target/debian'
-          PLUGIN_OS_CODENAME: ${{ matrix.code_name }}
-        run: ./ci/publish_deb_to_repo.sh
-
-      - name: Invalidate cloudfront
-        uses: chetan/invalidate-cloudfront-action@c384d5f09592318a77b1e5c0c8d4772317e48b25 #v2.4
-        env:
-          DISTRIBUTION: ${{ secrets.APTLY_DIST_ID }}
-          PATHS: "/*"
-          AWS_REGION: ${{ secrets.APTLY_REGION }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.APTLY_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.APTLY_SECRET_KEY }}
-
----
-name: publish-casper-sidecar-deb
 permissions:
   contents: read
   id-token: write
@@ -83,15 +16,13 @@ jobs:
         include:
           - os: ubuntu-20.04
             code_name: focal
-    #          - os: ubuntu-22.04
-    #            code_name: jammy
-    #          - os: ubuntu-24.04
-    #            code_name: noble
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2
+        with:
+          key: ${{ matrix.code_name }}
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -108,9 +39,6 @@ jobs:
           sudo apt-get install -y aptly=1.4.0
           aptly config show
 
-      - name: update toolchain
-        run: rustup update nightly
-
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@c8bb57c57e8df1be8c73ff3d59deab1dbc00e0d1 #v5.1.0
         with:
@@ -120,8 +48,11 @@ jobs:
       - name: Install cargo deb
         run: cargo install cargo-deb
 
+      - name: Cargo build
+        run: cargo build --release
+
       - name: Cargo deb
-        run: cargo deb --package casper-sidecar --variant ${{ matrix.code_name }}
+        run: cargo deb --no-build --variant ${{ matrix.code_name }}
 
       - name: Upload binaries to repo
         env:

ci/publish_deb_to_repo.sh

@@ -1,21 +1,17 @@
 #!/usr/bin/env bash
 set -e
 
-# DEFAULTS
-PLUGIN_OS_CODENAME="${PLUGIN_OS_CODENAME:-bionic}"
-
 # Verify all variables are present
 if [[ -z $PLUGIN_GPG_KEY || -z $PLUGIN_GPG_PASS || -z $PLUGIN_REGION \
         || -z $PLUGIN_REPO_NAME || -z $PLUGIN_ACL || -z $PLUGIN_PREFIX \
-        || -z $AWS_SECRET_ACCESS_KEY || -z $AWS_ACCESS_KEY_ID \
         || -z $PLUGIN_DEB_PATH || -z $PLUGIN_OS_CODENAME ]]; then
     echo "ERROR: Environment Variable Missing!"
     exit 1
 fi
 
 # Verify if its the first time publishing. Will need to know later.
 # Probably an easier way to do this check :)
-EXISTS=$(aws s3 ls s3://"$PLUGIN_REPO_NAME"/releases/dists/ --region "$PLUGIN_REGION" | grep "$PLUGIN_OS_CODENAME") || EXISTS_RET="false"
+EXISTS_RET=$(aws s3 ls s3://"$PLUGIN_REPO_NAME"/releases/dists/ --region "$PLUGIN_REGION" | grep "$PLUGIN_OS_CODENAME") || EXISTS_RET="false"
 
 # Sanity Check for later
 if [ "$EXISTS_RET" = "false" ]; then