Skip to content

Commit f022f94

Browse files
kazai777kazai777
authored
Merge branch 'gnolang:master' into master
2 parents 1a54c8d + 54bd960 commit f022f94

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2868
-434
lines changed

‎.github/workflows/autocounterd.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: autocounterd
2+
3+
on:
4+
push:
5+
paths:
6+
- misc/autocounterd
7+
- .github/workflows/autocounterd.yml
8+
branches:
9+
- "master"
10+
- "misc/autocounterd"
11+
tags:
12+
- "v*"
13+
14+
permissions:
15+
contents: read
16+
packages: write
17+
18+
jobs:
19+
autocounterd:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v3
24+
25+
- name: Login to GitHub Container Registry
26+
uses: docker/login-action@v2
27+
with:
28+
registry: ghcr.io
29+
username: ${{ github.repository_owner }}
30+
password: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- name: Docker metadata autcounterd
33+
id: meta
34+
uses: docker/metadata-action@v5
35+
with:
36+
images: ghcr.io/${{ github.repository }}/autcounterd
37+
tags: |
38+
type=raw,value=latest
39+
type=semver,pattern=v{{version}}
40+
41+
- name: Build and push
42+
uses: docker/build-push-action@v4
43+
with:
44+
context: ./misc/autocounterd
45+
push: ${{ github.event_name != 'pull_request' }}
46+
tags: ${{ steps.meta.outputs.tags }}
47+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/docker.yml‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -14,69 +14,71 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
jobs:
17-
build-push:
17+
build-main:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222

23-
- name: Build main Docker image
24-
env:
25-
owner: ${{ github.repository_owner }}
26-
reponame: ${{ github.event.repository.name }}
27-
run: |
28-
docker build -t ghcr.io/${owner}/${reponame} .
29-
docker tag ghcr.io/${owner}/${reponame}:latest ghcr.io/${owner}/${reponame}:${GITHUB_SHA::8}
23+
- name: Get commit SHA
24+
id: commit
25+
run: echo "sha=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"
3026

31-
- name: Build slim Docker images
32-
env:
33-
owner: ${{ github.repository_owner }}
34-
reponame: ${{ github.event.repository.name }}
35-
run: |
36-
docker build --target=gnoland-slim -t ghcr.io/${owner}/${reponame}/gnoland-slim .
37-
docker build --target=gnokey-slim -t ghcr.io/${owner}/${reponame}/gnokey-slim .
38-
docker build --target=gno-slim -t ghcr.io/${owner}/${reponame}/gno-slim .
39-
docker build --target=gnofaucet-slim -t ghcr.io/${owner}/${reponame}/gnofaucet-slim .
40-
docker build --target=gnoweb-slim -t ghcr.io/${owner}/${reponame}/gnoweb-slim .
27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v3
4129

42-
docker tag ghcr.io/${owner}/${reponame}/gnoland-slim:latest ghcr.io/${owner}/${reponame}/gnoland-slim:${GITHUB_SHA::8}
43-
docker tag ghcr.io/${owner}/${reponame}/gnokey-slim:latest ghcr.io/${owner}/${reponame}/gnokey-slim:${GITHUB_SHA::8}
44-
docker tag ghcr.io/${owner}/${reponame}/gno-slim:latest ghcr.io/${owner}/${reponame}/gno-slim:${GITHUB_SHA::8}
45-
docker tag ghcr.io/${owner}/${reponame}/gnofaucet-slim:latest ghcr.io/${owner}/${reponame}/gnofaucet-slim:${GITHUB_SHA::8}
46-
docker tag ghcr.io/${owner}/${reponame}/gnoweb-slim:latest ghcr.io/${owner}/${reponame}/gnoweb-slim:${GITHUB_SHA::8}
47-
48-
- name: List docker images
49-
run: |
50-
docker images | grep ghcr
51-
52-
- name: Log in to GitHub Container Registry
53-
if: (github.event_name != 'pull_request')
30+
- name: Login to GitHub Container Registry
5431
uses: docker/login-action@v3
32+
if: (github.event_name != 'pull_request')
5533
with:
5634
registry: ghcr.io
5735
username: ${{ github.actor }}
5836
password: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- name: Build and push
39+
uses: docker/build-push-action@v3
40+
with:
41+
context: .
42+
platforms: linux/amd64,linux/arm64
43+
push: ${{ github.event_name != 'pull_request' }}
44+
tags: |
45+
ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest
46+
ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ steps.commit.outputs.sha }}
5947
60-
- name: Publish images
61-
if: (github.event_name != 'pull_request')
62-
env:
63-
owner: ${{ github.repository_owner }}
64-
reponame: ${{ github.event.repository.name }}
65-
run: |
66-
docker push ghcr.io/${owner}/${reponame}:latest
67-
docker push ghcr.io/${owner}/${reponame}:${GITHUB_SHA::8}
68-
69-
docker push ghcr.io/${owner}/${reponame}/gnoland-slim:latest
70-
docker push ghcr.io/${owner}/${reponame}/gnoland-slim:${GITHUB_SHA::8}
48+
build-slim:
49+
runs-on: ubuntu-latest
50+
strategy:
51+
matrix:
52+
target: [gnoland-slim, gnokey-slim, gno-slim, gnofaucet-slim, gnoweb-slim]
53+
steps:
54+
- name: Checkout
55+
uses: actions/checkout@v4
7156

72-
docker push ghcr.io/${owner}/${reponame}/gnokey-slim:latest
73-
docker push ghcr.io/${owner}/${reponame}/gnokey-slim:${GITHUB_SHA::8}
57+
- name: Get commit SHA
58+
id: commit
59+
run: echo "sha=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"
7460

75-
docker push ghcr.io/${owner}/${reponame}/gno-slim:latest
76-
docker push ghcr.io/${owner}/${reponame}/gno-slim:${GITHUB_SHA::8}
61+
- name: Set up Docker Buildx
62+
uses: docker/setup-buildx-action@v3
7763

78-
docker push ghcr.io/${owner}/${reponame}/gnofaucet-slim:latest
79-
docker push ghcr.io/${owner}/${reponame}/gnofaucet-slim:${GITHUB_SHA::8}
64+
- name: Set up Docker Buildx
65+
uses: docker/setup-buildx-action@v3
8066

81-
docker push ghcr.io/${owner}/${reponame}/gnoweb-slim:latest
82-
docker push ghcr.io/${owner}/${reponame}/gnoweb-slim:${GITHUB_SHA::8}
67+
- name: Login to GitHub Container Registry
68+
uses: docker/login-action@v3
69+
if: (github.event_name != 'pull_request')
70+
with:
71+
registry: ghcr.io
72+
username: ${{ github.actor }}
73+
password: ${{ secrets.GITHUB_TOKEN }}
74+
75+
- name: Build and push
76+
uses: docker/build-push-action@v3
77+
with:
78+
context: .
79+
platforms: linux/amd64,linux/arm64
80+
target: ${{ matrix.target }}
81+
push: ${{ github.event_name != 'pull_request' }}
82+
tags: |
83+
ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ matrix.target }}:latest
84+
ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ matrix.target }}:${{ steps.commit.outputs.sha }}

‎contribs/gnodev/go.mod‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,73 @@ go 1.21
55
replace github.com/gnolang/gno => ../..
66

77
require (
8+
github.com/charmbracelet/lipgloss v0.9.1
9+
github.com/charmbracelet/log v0.3.1
810
github.com/fsnotify/fsnotify v1.7.0
911
github.com/gnolang/gno v0.0.0-00010101000000-000000000000
1012
github.com/gorilla/websocket v1.5.1
13+
github.com/muesli/termenv v0.15.2
1114
go.uber.org/zap v1.27.0
1215
golang.org/x/term v0.18.0
1316
)
1417

1518
require (
1619
dario.cat/mergo v1.0.0 // indirect
17-
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
20+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
21+
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
1822
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
23+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
1924
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
2025
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
2126
github.com/davecgh/go-spew v1.1.1 // indirect
22-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
27+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
2328
github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216 // indirect
29+
github.com/go-logfmt/logfmt v0.6.0 // indirect
30+
github.com/go-logr/logr v1.4.1 // indirect
31+
github.com/go-logr/stdr v1.2.2 // indirect
2432
github.com/golang/protobuf v1.5.4 // indirect
2533
github.com/golang/snappy v0.0.4 // indirect
2634
github.com/gorilla/mux v1.8.1 // indirect
2735
github.com/gorilla/securecookie v1.1.1 // indirect
2836
github.com/gorilla/sessions v1.2.1 // indirect
2937
github.com/gotuna/gotuna v0.6.0 // indirect
38+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
3039
github.com/jaekwon/testify v1.6.1 // indirect
31-
github.com/kr/pretty v0.2.1 // indirect
3240
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
41+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
42+
github.com/mattn/go-isatty v0.0.18 // indirect
43+
github.com/mattn/go-runewidth v0.0.15 // indirect
44+
github.com/muesli/reflow v0.3.0 // indirect
3345
github.com/pelletier/go-toml v1.9.5 // indirect
3446
github.com/peterbourgon/ff/v3 v3.4.0 // indirect
3547
github.com/pkg/errors v0.9.1 // indirect
3648
github.com/pmezard/go-difflib v1.0.0 // indirect
49+
github.com/rivo/uniseg v0.4.3 // indirect
3750
github.com/rogpeppe/go-internal v1.12.0 // indirect
3851
github.com/rs/cors v1.10.1 // indirect
3952
github.com/stretchr/testify v1.9.0 // indirect
4053
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
4154
github.com/zondax/hid v0.9.2 // indirect
4255
github.com/zondax/ledger-go v0.14.3 // indirect
56+
go.opentelemetry.io/otel v1.25.0 // indirect
57+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.25.0 // indirect
58+
go.opentelemetry.io/otel/metric v1.25.0 // indirect
59+
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
60+
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
61+
go.opentelemetry.io/otel/trace v1.25.0 // indirect
62+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
4363
go.uber.org/multierr v1.11.0 // indirect
4464
go.uber.org/zap/exp v0.2.0 // indirect
4565
golang.org/x/crypto v0.21.0 // indirect
4666
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
4767
golang.org/x/mod v0.16.0 // indirect
48-
golang.org/x/net v0.22.0 // indirect
68+
golang.org/x/net v0.23.0 // indirect
4969
golang.org/x/sys v0.18.0 // indirect
5070
golang.org/x/text v0.14.0 // indirect
5171
golang.org/x/tools v0.19.0 // indirect
52-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
53-
google.golang.org/grpc v1.58.3 // indirect
72+
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
73+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
74+
google.golang.org/grpc v1.63.0 // indirect
5475
google.golang.org/protobuf v1.33.0 // indirect
5576
gopkg.in/yaml.v3 v3.0.1 // indirect
5677
)

0 commit comments

Comments
 (0)