feat: fix conflicts

0xPolygon · Oct 4, 2024 · c91b55e · c91b55e
2 parents 78e5080 + db54c2d
commit c91b55e
Show file tree

Hide file tree

Showing 41 changed files with 798 additions and 255 deletions.
diff --git a/.github/workflows/arm_deb_packager.yml b/.github/workflows/arm_deb_packager.yml
@@ -0,0 +1,89 @@
+name: arm_deb_packager
+
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - '**'
+    tags:
+      - 'v*.*.*'
+      - 'v*.*.*-*'
+
+jobs:
+  build:
+    permissions:
+      id-token: write
+      contents: write
+    runs-on:
+      labels: arm-runner-2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@master
+        with:
+          go-version: 1.22.x
+      # Variables
+      - name: Adding TAG to ENV
+        run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
+      - name: adding version
+        run: |
+          NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' ) 
+          echo "VERSION=$NUMERIC_VERSION" >> $GITHUB_ENV
+
+      - name: go mod download
+        run: go mod download
+
+      - name: Build the binary
+        run: make build
+
+      - name: Build the rust binary
+        run: |
+          BUILD_SCRIPT_DISABLED=1
+          cargo build --release --bin cdk
+
+      - name: making directory structure
+        run: mkdir -p packaging/deb/cdk/usr/bin/
+      - name: copying necessary binary for arm64
+        run: cp -rp target/cdk-node packaging/deb/cdk/usr/bin/cdk-node
+      - name: copying rust binary for arm64
+        run: cp -rp target/release/cdk packaging/deb/cdk/usr/bin/cdk
+
+      # Control file creation
+      - name: Create control file
+        run: |
+          echo "Package: cdk" >> packaging/deb/cdk/DEBIAN/control
+          echo "Version: ${{ env.VERSION }}" >> packaging/deb/cdk/DEBIAN/control
+          echo "Section: base" >> packaging/deb/cdk/DEBIAN/control
+          echo "Priority: optional" >> packaging/deb/cdk/DEBIAN/control
+          echo "Architecture: arm64" >> packaging/deb/cdk/DEBIAN/control
+          echo "Maintainer: [email protected]" >> packaging/deb/cdk/DEBIAN/control
+          echo "Description: cdk binary package" >> packaging/deb/cdk/DEBIAN/control
+
+      - name: Creating package for binary for cdk ${{ env.ARCH }}
+        run: cp -rp packaging/deb/cdk packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+          ARCH: arm64
+
+      - name: Running package build
+        run: dpkg-deb --build --root-owner-group packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+          ARCH: arm64
+
+      - name: create checksum for the arm64 package
+        run: cd packaging/deb/ && sha256sum cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
+        env:
+          ARCH: arm64
+
+      - name: Release cdk Packages
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.GIT_TAG }}
+          prerelease: true
+          files: |
+            packaging/deb/cdk**.deb
+            packaging/deb/cdk**.deb.checksum
diff --git a/.github/workflows/arm_rpm_packager.yml b/.github/workflows/arm_rpm_packager.yml
@@ -0,0 +1,103 @@
+name: arm_rpm_packager
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - '**'
+    tags:
+      - 'v*.*.*'
+      - 'v*.*.*-*'
+
+jobs:
+  build:
+    permissions:
+      id-token: write
+      contents: write
+    runs-on:
+      labels: arm-runner-2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@master
+        with:
+          go-version: 1.22.x
+      - name: Adding TAG to ENV
+        run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
+
+      - name: Adding a TAG.1 to the env
+        run: echo "GIT_TAG1=`echo $(git describe --tags --abbrev=0)`" | sed 's/-/./g' >> $GITHUB_ENV
+
+      - name: Download deps for project
+        run: go mod download
+
+      - name: Building cdk-node for amd64
+        run: make build
+
+      - name: Building the cdk
+        run: |
+          BUILD_SCRIPT_DISABLED=1
+          cargo build --release --bin cdk
+
+      - name: Installing some dependencies
+        run: sudo apt-get update && sudo apt-get install -y rpm
+
+      - name: Setup rpm package for binary
+        run: |
+          mkdir -p packaging/rpm/SPECS
+          mkdir -p packaging/rpm/BUILD
+          mkdir -p packaging/rpm/RPMS
+          mkdir -p packaging/rpm/SRPMS
+          
+          touch packaging/rpm/cdk.spec 
+          echo "Name: cdk" >> packaging/rpm/SPECS/cdk.spec
+          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/cdk.spec
+          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/cdk.spec
+          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/cdk.spec
+          echo "BuildArch: aarch64" >> packaging/rpm/SPECS/cdk.spec
+          echo "Summary: cdk rpm package" >> packaging/rpm/SPECS/cdk.spec
+          
+          echo "%description" >> packaging/rpm/SPECS/cdk.spec
+          echo "cdk rpm package" >> packaging/rpm/SPECS/cdk.spec
+          
+          echo "%pre" >> packaging/rpm/SPECS/cdk.spec
+          echo "getent group cdk >/dev/null || groupadd -r cdk" >> packaging/rpm/SPECS/cdk.spec
+          echo "getent passwd cdk >/dev/null || useradd -s /bin/false -d /opt/cdk -r cdk -g cdk" >> packaging/rpm/SPECS/cdk.spec
+          
+          echo "%install" >> packaging/rpm/SPECS/cdk.spec
+          echo "mkdir -p %{buildroot}/usr/bin" >> packaging/rpm/SPECS/cdk.spec
+          echo "cp /home/runner/work/cdk/cdk/target/cdk-node %{buildroot}/usr/bin/cdk-node" >> packaging/rpm/SPECS/cdk.spec
+          echo "cp /home/runner/work/cdk/cdk/target/release/cdk %{buildroot}/usr/bin/cdk" >> packaging/rpm/SPECS/cdk.spec
+          
+          echo "%files" >> packaging/rpm/SPECS/cdk.spec
+          echo "/usr/bin/cdk" >> packaging/rpm/SPECS/cdk.spec
+          echo "/usr/bin/cdk-node" >> packaging/rpm/SPECS/cdk.spec
+
+
+      - name: Construct rpm package
+        run: |
+          rpmbuild --define "_topdir /home/runner/work/cdk/cdk/packaging/rpm_build" \
+                   --define "_builddir %{_topdir}/BUILD" \
+                   --define "_rpmdir %{_topdir}/RPMS" \
+                   --define "_srcrpmdir %{_topdir}/SRPMS" \
+                   --define "__spec_install_post /bin/true" \
+                   -bb packaging/rpm/SPECS/cdk.spec
+
+      - name: Rename file for post rpm build and for checksum
+        run: mv /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}-1.aarch64.rpm /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}.aarch64.rpm
+
+      - name: Checksum for the rpm package
+        run: sha256sum /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}.aarch64.rpm > /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}.aarch64.rpm.checksum
+
+      - name: Release cdk Packages
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.GIT_TAG }}
+          prerelease: true
+          files: |
+            packaging/rpm_build/RPMS/aarch64/cdk-**.rpm
+            packaging/rpm_build/RPMS/aarch64/cdk-**.rpm.checksum
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21.x
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -13,7 +13,11 @@ jobs:
       matrix:
         go-version: [ 1.22.x ]
         goarch: [ "amd64" ]
-        e2e-group: [ "elderberry-validium", "elderberry-rollup" ]
+        e2e-group:
+          - "fork9-validium"
+          - "fork9-rollup"
+          - "fork12-validium"
+          - "fork12-rollup"
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
@@ -35,7 +39,7 @@ jobs:
       run: |
         echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
         sudo apt update
-        sudo apt install kurtosis-cli=0.90.1
+        sudo apt install kurtosis-cli=1.3.0
         kurtosis version
 
     - name: Disable kurtosis analytics

diff --git a/.github/workflows/x86_deb_packager.yml b/.github/workflows/x86_deb_packager.yml
@@ -0,0 +1,89 @@
+name: x86_deb_packager
+
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - '**'
+    tags:
+      - 'v*.*.*'
+      - 'v*.*.*-*'
+
+jobs:
+  build:
+    permissions:
+      id-token: write
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@master
+        with:
+          go-version: 1.22.x
+      # Variables
+      - name: Adding TAG to ENV
+        run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
+      - name: adding version
+        run: |
+          NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' ) 
+          echo "VERSION=$NUMERIC_VERSION" >> $GITHUB_ENV
+
+      - name: go mod download
+        run: go mod download
+
+      - name: Build the binary
+        run: make build
+
+      - name: Build the rust binary
+        run: |
+          BUILD_SCRIPT_DISABLED=1
+          cargo build --release --bin cdk
+
+      - name: making directory structure
+        run: mkdir -p packaging/deb/cdk/usr/bin/
+      - name: copying necessary binary for amd64
+        run: cp -rp target/cdk-node packaging/deb/cdk/usr/bin/cdk-node
+      - name: copying rust binary for amd64
+        run: cp -rp target/release/cdk packaging/deb/cdk/usr/bin/cdk
+
+      # Control file creation
+      - name: Create control file
+        run: |
+          echo "Package: cdk" >> packaging/deb/cdk/DEBIAN/control
+          echo "Version: ${{ env.VERSION }}" >> packaging/deb/cdk/DEBIAN/control
+          echo "Section: base" >> packaging/deb/cdk/DEBIAN/control
+          echo "Priority: optional" >> packaging/deb/cdk/DEBIAN/control
+          echo "Architecture: amd64" >> packaging/deb/cdk/DEBIAN/control
+          echo "Maintainer: [email protected]" >> packaging/deb/cdk/DEBIAN/control
+          echo "Description: cdk binary package" >> packaging/deb/cdk/DEBIAN/control
+
+      - name: Creating package for binary for cdk ${{ env.ARCH }}
+        run: cp -rp packaging/deb/cdk packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+          ARCH: amd64
+
+      - name: Running package build
+        run: dpkg-deb --build --root-owner-group packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+          ARCH: amd64
+
+      - name: Create checksum for the amd64 package
+        run: cd packaging/deb/ && sha256sum cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
+        env:
+          ARCH: amd64
+
+
+      - name: Release cdk Packages
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.GIT_TAG }}
+          prerelease: true
+          files: |
+            packaging/deb/cdk**.deb
+            packaging/deb/cdk**.deb.checksum