Skip to content

Commit caf04d2

Browse files
fxamackerfxamacker
authored
Merge pull request #428 from onflow/fxamacker/update-array-map-inlining
Update feature/array-map-inlining (atree inlining feature branch)
2 parents 0db5873 + 691b753 commit caf04d2

File tree

6 files changed

+24
-68
lines changed

6 files changed

+24
-68
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535

3636
steps:
3737
- name: Install Go
38-
uses: actions/setup-go@v4
38+
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
3939
with:
4040
go-version: ${{ matrix.go-version }}
4141
check-latest: true
4242

4343
- name: Checkout code
44-
uses: actions/checkout@v3
44+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4545
with:
4646
fetch-depth: 1
4747

‎.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,18 @@ jobs:
3333

3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v3
37-
38-
- name: Set up Go 1.19
39-
uses: actions/setup-go@v4
40-
with:
41-
go-version: '1.19'
42-
check-latest: true
36+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4337

4438
# Initializes the CodeQL tools for scanning.
4539
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
40+
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
4741
with:
4842
languages: ${{ matrix.language }}
4943

44+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5045
# If this step fails, then you should remove it and run the build manually (see below)
5146
- name: Autobuild
52-
uses: github/codeql-action/autobuild@v2
53-
54-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
55-
# and modify them (or add more) to build your code if your project
56-
# uses a compiled language
57-
58-
#- run: |
59-
# make bootstrap
60-
# make release
47+
uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
6148

6249
- name: Perform CodeQL Analysis
63-
uses: github/codeql-action/analyze@v2
50+
uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13

‎.github/workflows/coverage.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ jobs:
1616
contents: read
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2020
with:
2121
fetch-depth: 2
2222

23-
- uses: actions/setup-go@v4
23+
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2424
with:
25-
go-version: '1.20'
2625
check-latest: true
2726

2827
- name: Get dependencies
@@ -35,7 +34,7 @@ jobs:
3534
run: go test -timeout 180m -race -coverprofile=coverage.txt -covermode=atomic
3635

3736
- name: Upload coverage report to Codecov
38-
uses: codecov/codecov-action@v3.1.4
37+
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
3938
with:
4039
files: ./coverage.txt
4140
fail_ci_if_error: false # we can set this to true after "Could not find a repository" upload error is fixed

‎.github/workflows/safer-golangci-lint.yml

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,6 @@
44
# Safer GitHub Actions Workflow for golangci-lint.
55
# https://github.com/x448/safer-golangci-lint
66
#
7-
# safer-golangci-lint.yml
8-
#
9-
# This workflow downloads, verifies, and runs golangci-lint in a
10-
# deterministic, reviewable, and safe manner.
11-
#
12-
# To use:
13-
# Step 1. Copy this file into [your_github_repo]/.github/workflows/
14-
# Step 2. There's no step 2 if you like the default settings.
15-
#
16-
# See golangci-lint docs for more info at
17-
# https://github.com/golangci/golangci-lint
18-
#
19-
# 100% of the script for downloading, installing, and running golangci-lint
20-
# is embedded in this file. The embedded SHA-256 digest is used to verify the
21-
# downloaded golangci-lint tarball (golangci-lint-1.xx.x-linux-amd64.tar.gz).
22-
#
23-
# The embedded SHA-256 digest matches golangci-lint-1.xx.x-checksums.txt at
24-
# https://github.com/golangci/golangci-lint/releases
25-
#
26-
# To use a newer version of golangci-lint, change these values:
27-
# 1. GOLINTERS_VERSION
28-
# 2. GOLINTERS_TGZ_DGST
29-
#
30-
# Release v1.52.2 (May 14, 2023)
31-
# - Bump Go to 1.20
32-
# - Bump actions/setup-go to v4
33-
# - Bump golangci-lint to 1.52.2
34-
# - Hash of golangci-lint-1.52.2-linux-amd64.tar.gz
35-
# - SHA-256: c9cf72d12058a131746edd409ed94ccd578fbd178899d1ed41ceae3ce5f54501
36-
# This SHA-256 digest matches golangci-lint-1.52.2-checksums.txt at
37-
# https://github.com/golangci/golangci-lint/releases
38-
#
397
name: linters
408

419
# Remove default permissions and grant only what is required in each job.
@@ -48,10 +16,10 @@ on:
4816
branches: [main, master]
4917

5018
env:
51-
GO_VERSION: '1.20'
52-
GOLINTERS_VERSION: 1.52.2
19+
GO_VERSION: '1.22'
20+
GOLINTERS_VERSION: 1.56.2
5321
GOLINTERS_ARCH: linux-amd64
54-
GOLINTERS_TGZ_DGST: c9cf72d12058a131746edd409ed94ccd578fbd178899d1ed41ceae3ce5f54501
22+
GOLINTERS_TGZ_DGST: e1c313fb5fc85a33890fdee5dbb1777d1f5829c84d655a47a55688f3aad5e501
5523
GOLINTERS_TIMEOUT: 15m
5624
OPENSSL_DGST_CMD: openssl dgst -sha256 -r
5725
CURL_CMD: curl --proto =https --tlsv1.2 --location --silent --show-error --fail
@@ -64,12 +32,12 @@ jobs:
6432
contents: read
6533
steps:
6634
- name: Checkout source
67-
uses: actions/checkout@v3
35+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6836
with:
6937
fetch-depth: 1
7038

7139
- name: Setup Go
72-
uses: actions/setup-go@v4
40+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
7341
with:
7442
go-version: ${{ env.GO_VERSION }}
7543
check-latest: true

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ go 1.17
55
require (
66
github.com/fxamacker/cbor/v2 v2.4.1-0.20220515183430-ad2eae63303f
77
github.com/fxamacker/circlehash v0.3.0
8-
github.com/stretchr/testify v1.8.4
8+
github.com/stretchr/testify v1.9.0
99
github.com/zeebo/blake3 v0.2.3
10-
lukechampine.com/blake3 v1.2.1
10+
lukechampine.com/blake3 v1.3.0
1111
)
1212

1313
require (
1414
github.com/davecgh/go-spew v1.1.1 // indirect
1515
github.com/klauspost/cpuid/v2 v2.0.12 // indirect
1616
github.com/pmezard/go-difflib v1.0.0 // indirect
17-
github.com/stretchr/objx v0.5.0 // indirect
17+
github.com/stretchr/objx v0.5.2 // indirect
1818
github.com/x448/float16 v0.8.4 // indirect
1919
gopkg.in/yaml.v3 v3.0.1 // indirect
2020
)

‎go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1212
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1313
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1414
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
15-
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
1615
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
16+
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
17+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
1718
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1819
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
19-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
2020
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
21+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
22+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
2123
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
2224
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
2325
github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
@@ -31,5 +33,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
3133
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
3234
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
3335
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
34-
lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
35-
lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
36+
lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
37+
lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

0 commit comments

Comments
 (0)