Add integration to docker image and add darwin

testinprod-io · Sep 19, 2024 · 8241ac4 · 8241ac4
1 parent 28cf5b7
commit 8241ac4
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 56 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -156,23 +156,23 @@ jobs:
           compression-level: 0
           if-no-files-found: error
 
-      # - name: Upload artifact -- darwin/arm64
-      #   uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a  ## v4.3.6
-      #   with:
-      #     name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
-      #     path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
-      #     retention-days: 1
-      #     compression-level: 0
-      #     if-no-files-found: error
+      - name: Upload artifact -- darwin/arm64
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a  ## v4.3.6
+        with:
+          name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
+          path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
+          retention-days: 1
+          compression-level: 0
+          if-no-files-found: error
 
-      # - name: Upload artifact -- darwin/amd64
-      #   uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a  ## v4.3.6
-      #   with:
-      #     name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
-      #     path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
-      #     retention-days: 1
-      #     compression-level: 0
-      #     if-no-files-found: error
+      - name: Upload artifact -- darwin/amd64
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a  ## v4.3.6
+        with:
+          name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
+          path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
+          retention-days: 1
+          compression-level: 0
+          if-no-files-found: error
 
       # - name: Upload artifact -- windows/amd64
       #   uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a  ## v4.3.6

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -20,7 +20,6 @@ builds:
 
 ## Darwin AMD64:
   - id: darwin-amd64-erigon
-    skip: true
     main: ./cmd/erigon
     binary: erigon
     goos: [ darwin ]
@@ -146,7 +145,6 @@ builds:
       - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
 
   - id: darwin-amd64-integration
-    skip: true
     main: ./cmd/integration
     binary: integration
     goos: [ darwin ]
@@ -233,7 +231,6 @@ builds:
 
 ## Darwin ARM64:
   - id: darwin-arm64-erigon
-    skip: true
     main: ./cmd/erigon
     binary: erigon
     goos: [ darwin ]
@@ -347,7 +344,6 @@ builds:
       - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
 
   - id: darwin-arm64-integration
-    skip: true
     main: ./cmd/integration
     binary: integration
     goos: [ darwin ]
@@ -1051,8 +1047,8 @@ checksum:
   ids:
     - linux-arm64
     - linux-amd64
-    # - darwin-amd64
-    # - darwin-arm64
+    - darwin-amd64
+    - darwin-arm64
     # - windows-amd64
 
 dockers:
@@ -1100,7 +1096,7 @@ archives:
       # - linux-arm64-evm
       # - linux-arm64-caplin
       # - linux-arm64-diag
-      # - linux-arm64-integration
+      - linux-arm64-integration
       # - linux-arm64-rpcdaemon
       # - linux-arm64-sentry
       # - linux-arm64-txpool
@@ -1116,45 +1112,45 @@ archives:
       # - linux-amd64-evm
       # - linux-amd64-caplin
       # - linux-amd64-diag
-      # - linux-amd64-integration
+      - linux-amd64-integration
       # - linux-amd64-rpcdaemon
       # - linux-amd64-sentry
       # - linux-amd64-txpool
     name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
     wrap_in_directory: true
     format: tar.gz
 
-  # - id: darwin-amd64
-  #   builds:
-  #     - darwin-amd64-erigon
-  #     - darwin-amd64-downloader
-  #     - darwin-amd64-devnet
-  #     - darwin-amd64-evm
-  #     - darwin-amd64-caplin
-  #     - darwin-amd64-diag
-  #     - darwin-amd64-integration
-  #     - darwin-amd64-rpcdaemon
-  #     - darwin-amd64-sentry
-  #     - darwin-amd64-txpool
-  #   name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
-  #   wrap_in_directory: true
-  #   format: tar.gz
+  - id: darwin-amd64
+    builds:
+      - darwin-amd64-erigon
+      # - darwin-amd64-downloader
+      # - darwin-amd64-devnet
+      # - darwin-amd64-evm
+      # - darwin-amd64-caplin
+      # - darwin-amd64-diag
+      - darwin-amd64-integration
+      # - darwin-amd64-rpcdaemon
+      # - darwin-amd64-sentry
+      # - darwin-amd64-txpool
+    name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
+    wrap_in_directory: true
+    format: tar.gz
 
-  # - id: darwin-arm64
-  #   builds:
-  #     - darwin-arm64-erigon
-  #     - darwin-arm64-downloader
-  #     - darwin-arm64-devnet
-  #     - darwin-arm64-evm
-  #     - darwin-arm64-caplin
-  #     - darwin-arm64-diag
-  #     - darwin-arm64-integration
-  #     - darwin-arm64-rpcdaemon
-  #     - darwin-arm64-sentry
-  #     - darwin-arm64-txpool
-  #   name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
-  #   wrap_in_directory: true
-  #   format: tar.gz
+  - id: darwin-arm64
+    builds:
+      - darwin-arm64-erigon
+      # - darwin-arm64-downloader
+      # - darwin-arm64-devnet
+      # - darwin-arm64-evm
+      # - darwin-arm64-caplin
+      # - darwin-arm64-diag
+      - darwin-arm64-integration
+      # - darwin-arm64-rpcdaemon
+      # - darwin-arm64-sentry
+      # - darwin-arm64-txpool
+    name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
+    wrap_in_directory: true
+    format: tar.gz
 
   # - id: windows-amd64
   #   builds:

diff --git a/Dockerfile.release b/Dockerfile.release
@@ -23,8 +23,8 @@ RUN --mount=type=bind,from=temporary,source=/tmp/${APPLICATION},target=/tmp/${AP
     addgroup ${GROUP} && \
     adduser -D -h /home/${USER} -G ${GROUP} ${USER} && \
     install -d -o ${USER} -g ${GROUP} /home/${USER}/.local /home/${USER}/.local/share /home/${USER}/.local/share/erigon && \
-    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/erigon /usr/local/bin/
-#    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/integration /usr/local/bin/ && \
+    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/erigon /usr/local/bin/ && \
+    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/integration /usr/local/bin/
 #    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/diag /usr/local/bin/ && \
 #    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/sentry /usr/local/bin/ && \
 #    install -o ${USER} -g ${GROUP} /tmp/${APPLICATION}/txpool /usr/local/bin/ && \