Merge branch 'master' of github.com:gnolang/gno into dev/morgan/heigh…

…t-recover
gnolang · Oct 2, 2024 · fdb69d6 · fdb69d6
2 parents db52967 + 09b6241
commit fdb69d6
Show file tree

Hide file tree

Showing 55 changed files with 1,995 additions and 178 deletions.
diff --git a/.benchmarks/README.md b/.benchmarks/README.md
diff --git a/.benchmarks/gobenchdata-checks.yml b/.benchmarks/gobenchdata-checks.yml
diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
@@ -86,6 +86,21 @@ builds:
     goarm:
       - 6
       - 7
+  - id: gnobro
+    dir: ./contribs/gnodev/cmd/gnobro
+    binary: gnobro
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
 
 gomod:
   proxy: true
@@ -489,6 +504,74 @@ dockers:
     ids:
       - gnofaucet
 
+  # gnobro
+  - use: buildx
+    dockerfile: Dockerfile.release
+    goos: linux
+    goarch: amd64
+    image_templates:
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-amd64"
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-amd64"
+    build_flag_templates:
+      - "--target=gnobro"
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}/gnobro"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+    ids:
+      - gnobro
+  - use: buildx
+    dockerfile: Dockerfile.release
+    goos: linux
+    goarch: arm64
+    image_templates:
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-arm64v8"
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-arm64v8"
+    build_flag_templates:
+      - "--target=gnobro"
+      - "--platform=linux/arm64/v8"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}/gnobro"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+    ids:
+      - gnobro
+  - use: buildx
+    dockerfile: Dockerfile.release
+    goos: linux
+    goarch: arm
+    goarm: 6
+    image_templates:
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-armv6"
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-armv6"
+    build_flag_templates:
+      - "--target=gnobro"
+      - "--platform=linux/arm/v6"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}/gnobro"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+    ids:
+      - gnobro
+  - use: buildx
+    dockerfile: Dockerfile.release
+    goos: linux
+    goarch: arm
+    goarm: 7
+    image_templates:
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-armv7"
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-armv7"
+    build_flag_templates:
+      - "--target=gnobro"
+      - "--platform=linux/arm/v7"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}/gnobro"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+    ids:
+      - gnobro
+
 docker_manifests:
   # https://goreleaser.com/customization/docker_manifest/
 
@@ -562,6 +645,20 @@ docker_manifests:
       - ghcr.io/gnolang/{{ .ProjectName }}/gnofaucet:{{ .Env.TAG_VERSION }}-armv6
       - ghcr.io/gnolang/{{ .ProjectName }}/gnofaucet:{{ .Env.TAG_VERSION }}-armv7
 
+  # gnobro
+  - name_template: ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}
+    image_templates:
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-amd64
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-arm64v8
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-armv6
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Version }}-armv7
+  - name_template: ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}
+    image_templates:
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-amd64
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-arm64v8
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-armv6
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnobro:{{ .Env.TAG_VERSION }}-armv7
+
 docker_signs:
   - cmd: cosign
     env:

diff --git a/.github/workflows/benchmark-check.yml b/.github/workflows/benchmark-check.yml
@@ -9,4 +9,5 @@ jobs:
     secrets: inherit
     with:
       publish: false
-      test-flags: "-short"
+      test-flags: "-short"
+      external-data-json-path: "./cache/benchmark-data.json"
diff --git a/.github/workflows/benchmark-publish.yml b/.github/workflows/benchmark-publish.yml
@@ -4,10 +4,12 @@ on:
   workflow_dispatch:
   schedule:
     - cron:  '0 0 * * *' # run on default branch every day
+
 jobs:
   publish:
     uses: ./.github/workflows/benchmark_template.yml
     secrets: inherit
     with:
       publish: true
-      test-flags: "-timeout 50m"
+      test-flags: "-timeout 50m"
+      runner-additional-tag: "benchmarks-large"
diff --git a/.github/workflows/benchmark_template.yml b/.github/workflows/benchmark_template.yml
@@ -8,29 +8,65 @@ on:
       test-flags:
         required: true
         type: string
+      runner-additional-tag:
+        type: string
+        default: benchmarks
+      external-data-json-path:
+        type: string
+
+permissions:
+  # deployments permission to deploy GitHub pages website
+  deployments: write
+  # contents permission to update benchmark contents in gh-pages branch
+  contents: write
 
 env:
   CGO_ENABLED: 0
 
 jobs:
   benchmarks:
     if: ${{ github.repository == 'gnolang/gno' }}
-    runs-on: [self-hosted, Linux, X64, benchmark-v1]
+    runs-on: [self-hosted, Linux, X64, "${{ inputs.runner-additional-tag }}"]
     steps:
-    - name: checkout
+    - name: Checkout
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
+
     - uses: actions/setup-go@v5
       with:
         go-version: "1.22.x"
-    - name: "gobenchdata publish: ${{ inputs.publish }}"
-      run: go run go.bobheadxi.dev/gobenchdata@v1 action
-      env:
-        INPUT_PRUNE_COUNT: 30
-        INPUT_GO_TEST_FLAGS: "${{ inputs.test-flags }} -run=^$ -cpu 1,2" # executing only using one and two CPUs to not be dependant on the machine cores.
-        INPUT_PUBLISH: ${{ inputs.publish }}
-        INPUT_PUBLISH_BRANCH: gh-benchmarks
-        INPUT_BENCHMARKS_OUT: benchmarks.json
-        INPUT_CHECKS: ${{ !inputs.publish }}
-        INPUT_CHECKS_CONFIG: .benchmarks/gobenchdata-checks.yml
+
+    - name: Run benchmark
+      run: |
+        go test -benchmem -bench=. ./... -run=^$ \
+        -cpu 1,2 ${{ inputs.test-flags }} | tee benchmarks.txt
+
+    - name: Download previous benchmark data
+      uses: actions/cache@v4
+      with:
+        path: ./cache
+        key: ${{ runner.os }}-benchmark
+
+    - name: Store benchmark results into `gh-benchmarks` branch
+      uses: benchmark-action/github-action-benchmark@v1
+      # see https://github.com/benchmark-action/github-action-benchmark?tab=readme-ov-file#action-inputs
+      with:
+        name: Go Benchmarks
+        tool: 'go'
+        output-file-path: benchmarks.txt
+        # Where the previous data file is stored
+        external-data-json-path: ${{ inputs.external-data-json-path }}
+        # Show alert with commit comment on detecting possible performance regression
+        alert-threshold: '20%'
+        fail-on-alert: true
+        comment-on-alert: true
+        # Enable Job Summary for PRs
+        summary-always: true
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        # NOTE you need to use a separate GITHUB PAT token that has a write access to the specified repository.
+        # gh-repository: 'github.com/gnolang/benchmarks' # on gh-pages branch
+        gh-pages-branch: gh-benchmarks
+        benchmark-data-dir-path: .
+        auto-push: ${{ inputs.publish }}
+        alert-comment-cc-users: '@ajnavarro,@thehowl,@zivkovicmilos'
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -31,7 +31,7 @@ jobs:
         uses: coursier/cache-action@v6.4.6
 
       - name: Set up JDK 17
-        uses: coursier/setup-action@v1.3.5
+        uses: coursier/setup-action@v1.3.6
         with:
           jvm: temurin:1.17
 

diff --git a/Dockerfile.release b/Dockerfile.release
@@ -18,15 +18,13 @@ EXPOSE 26656 26657
 
 ENTRYPOINT [ "/usr/bin/gnoland" ]
 
-
 #
 ## ghcr.io/gnolang/gno/gnokey
 FROM base as gnokey
 
 COPY       ./gnokey /usr/bin/gnokey
 ENTRYPOINT [ "/usr/bin/gnokey" ]
 
-
 #
 ## ghcr.io/gnolang/gno/gnoweb
 FROM base as gnoweb
@@ -43,6 +41,14 @@ COPY       ./gnofaucet /usr/bin/gnofaucet
 EXPOSE     5050
 ENTRYPOINT [ "/usr/bin/gnofaucet" ]
 
+#
+## ghcr.io/gnolang/gno/gnobro
+FROM base as gnobro
+
+COPY       ./gnobro /usr/bin/gnobro
+EXPOSE     22
+ENTRYPOINT [ "/usr/bin/gnobro" ]
+
 #
 ## ghcr.io/gnolang/gno
 FROM base as gno