Skip to content

Commit f66f0fb

Browse files
authored
Merge pull request oasisprotocol#2156 from oasisprotocol/kostko/feature/oasis-core-25.0.0
Bump Oasis Core to 25.0
2 parents a9c4b65 + 200622d commit f66f0fb

File tree

36 files changed

+1099
-1062
lines changed

36 files changed

+1099
-1062
lines changed

.github/workflows/ci-examples.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Setup Go
9595
uses: actions/setup-go@v5
9696
with:
97-
go-version: "1.22.x"
97+
go-version: "1.23.x"
9898

9999
# Generate go.sum needed for linting.
100100
- name: Generate go.sum
@@ -103,10 +103,10 @@ jobs:
103103

104104
# NOTE: "file exists" tar errors can be safely ignored, because go is already installed.
105105
- name: Lint ${{ matrix.example }}
106-
uses: golangci/golangci-lint-action@v5.1.0
106+
uses: golangci/golangci-lint-action@v6.5.0
107107
with:
108108
# NOTE: The version must be specified without the patch version.
109-
version: v1.54.2
109+
version: v1.63
110110
working-directory: examples/${{ matrix.example }}
111111

112112
- name: Build ${{ matrix.example }}

.github/workflows/ci-lint.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ jobs:
7272
- name: Setup Go
7373
uses: actions/setup-go@v5
7474
with:
75-
go-version: "1.22.x"
75+
go-version: "1.23.x"
7676

7777
- name: Lint Go client-sdk
78-
uses: golangci/golangci-lint-action@v5.1.0
78+
uses: golangci/golangci-lint-action@v6.5.0
7979
with:
8080
# NOTE: The version must be specified without the patch version.
81-
version: v1.54.2
81+
version: v1.63
8282
working-directory: client-sdk/go
8383

8484
lint-go-tests-e2e:
@@ -101,13 +101,13 @@ jobs:
101101
- name: Setup Go
102102
uses: actions/setup-go@v5
103103
with:
104-
go-version: "1.22.x"
104+
go-version: "1.23.x"
105105

106106
- name: Lint E2E tests
107-
uses: golangci/golangci-lint-action@v5.1.0
107+
uses: golangci/golangci-lint-action@v6.5.0
108108
with:
109109
# NOTE: The version must be specified without the patch version.
110-
version: v1.56.1
110+
version: v1.63
111111
working-directory: tests/e2e
112112

113113
lint-go-reflect:
@@ -120,13 +120,13 @@ jobs:
120120
- name: Setup Go
121121
uses: actions/setup-go@v5
122122
with:
123-
go-version: "1.22.x"
123+
go-version: "1.23.x"
124124

125125
- name: Lint reflect-go
126-
uses: golangci/golangci-lint-action@v5.1.0
126+
uses: golangci/golangci-lint-action@v6.5.0
127127
with:
128128
# NOTE: The version must be specified without the patch version.
129-
version: v1.56.1
129+
version: v1.63
130130
working-directory: client-sdk/ts-web/core/reflect-go
131131

132132
lint-ts-web:

.github/workflows/ci-longtest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: "1.22.x"
26+
go-version: "1.23.x"
2727

2828
- name: Install Oasis dependencies
2929
run: |

.github/workflows/ci-test.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Set up Go
9999
uses: actions/setup-go@v5
100100
with:
101-
go-version: "1.22.x"
101+
go-version: "1.23.x"
102102

103103
- name: Unit tests with coverage
104104
working-directory: client-sdk/go
@@ -120,7 +120,7 @@ jobs:
120120
- name: Set up Go
121121
uses: actions/setup-go@v5
122122
with:
123-
go-version: "1.22.x"
123+
go-version: "1.23.x"
124124

125125
- name: Test build orc
126126
working-directory: tools/orc
@@ -218,6 +218,9 @@ jobs:
218218
working-directory: client-sdk/ts-web/core/playground
219219
run: ./sample-run-envoy.sh &
220220

221+
- name: 'testnet: Install system packages'
222+
run: sudo apt-get -y install bubblewrap
223+
221224
- name: 'testnet: Download artifacts'
222225
working-directory: tests
223226
run: ./download-artifacts.sh
@@ -303,7 +306,7 @@ jobs:
303306
# Run all E2E tests in mock SGX.
304307
OASIS_UNSAFE_SKIP_AVR_VERIFY: 1
305308
OASIS_UNSAFE_ALLOW_DEBUG_ENCLAVES: 1
306-
OASIS_UNSAFE_MOCK_SGX: 1
309+
OASIS_UNSAFE_MOCK_TEE: 1
307310
steps:
308311
- name: Checkout code
309312
uses: actions/checkout@v4
@@ -405,7 +408,7 @@ jobs:
405408
- name: Set up Go
406409
uses: actions/setup-go@v5
407410
with:
408-
go-version: "1.22.x"
411+
go-version: "1.23.x"
409412

410413
- name: Install Oasis dependencies
411414
run: |
@@ -484,7 +487,7 @@ jobs:
484487
- name: Set up Go
485488
uses: actions/setup-go@v5
486489
with:
487-
go-version: "1.22.x"
490+
go-version: "1.23.x"
488491

489492
- name: Generate
490493
working-directory: client-sdk/ts-web/core/reflect-go
@@ -521,7 +524,7 @@ jobs:
521524
- name: Set up Go
522525
uses: actions/setup-go@v5
523526
with:
524-
go-version: "1.22.x"
527+
go-version: "1.23.x"
525528

526529
- name: Install Oasis dependencies
527530
run: |

.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ linters:
1717
- dupl
1818
- errcheck
1919
- exhaustive
20-
- exportloopref
2120
- goconst
2221
- gocritic
2322
- gocyclo
@@ -52,9 +51,6 @@ linters-settings:
5251
# Switch statements are to be considered exhaustive if a 'default' case is
5352
# present, even if all enum members aren't listed in the switch.
5453
default-signifies-exhaustive: true
55-
govet:
56-
# Enabled checking for shadowed variables.
57-
check-shadowing: true
5854
goimports:
5955
# Put local imports after 3rd-party packages.
6056
local-prefixes: github.com/oasisprotocol/

0 commit comments

Comments
 (0)