Skip to content

Commit bea4e34

Browse files
committed
Merge branch 'main' into pb/circle-w3s
2 parents f89c8f7 + d982be9 commit bea4e34

File tree

533 files changed

+6777
-7494
lines changed

Some content is hidden

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

533 files changed

+6777
-7494
lines changed

.eslintrc.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.github/workflows/tagBasedImageBuild.yml renamed to .github/workflows/build-image-tag.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
include:
1616
- platform: linux/amd64
17-
runner: ubuntu-latest
17+
runner: ubuntu-24.04
1818
arch: amd64
1919
- platform: linux/arm64
2020
runner: ubuntu-24.04-arm64
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
ref: ${{ github.event.release.target_commitish }}
3030

@@ -53,7 +53,7 @@ jobs:
5353

5454
merge-manifests:
5555
needs: build
56-
runs-on: ubuntu-latest
56+
runs-on: ubuntu-24.04
5757
env:
5858
LATEST_TAG: ${{ github.event.release.target_commitish == 'main' && 'thirdweb/engine:latest' || '' }}
5959
steps:
@@ -86,4 +86,4 @@ jobs:
8686
- name: Inspect latest image (if applicable)
8787
if: ${{ env.LATEST_TAG != '' }}
8888
run: |
89-
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:latest
89+
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:latest

.github/workflows/check-build.yml renamed to .github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
name: Check Build
1+
name: Build
22

33
on: pull_request
44

55
jobs:
66
build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-24.04
88
steps:
99
- name: Checkout code
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111
with:
1212
ref: ${{ github.ref }}
1313

1414
- name: Set up Node.js
15-
uses: actions/setup-node@v3
15+
uses: actions/setup-node@v4
1616
with:
1717
node-version: "18"
1818
cache: "yarn"
19-
19+
2020
- name: Install dependencies
2121
run: yarn install
2222

.github/workflows/lint.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Lint
2+
3+
on: pull_request
4+
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-24.04
8+
steps:
9+
- name: Checkout code
10+
uses: actions/checkout@v4
11+
with:
12+
ref: ${{ github.ref }}
13+
14+
- name: Set up Node.js
15+
uses: actions/setup-node@v4
16+
with:
17+
node-version: "18"
18+
cache: "yarn"
19+
20+
- name: Install dependencies
21+
run: yarn install
22+
23+
- name: Run lint
24+
run: yarn lint

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
matrix:
1616
include:
1717
- platform: linux/amd64
18-
runner: ubuntu-latest
18+
runner: ubuntu-24.04
1919
arch: amd64
2020
- platform: linux/arm64
2121
runner: ubuntu-24.04-arm64
2222
arch: arm64
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: Set up Docker Buildx
2828
uses: docker/setup-buildx-action@v3
@@ -48,7 +48,7 @@ jobs:
4848

4949
merge-manifests:
5050
needs: build
51-
runs-on: ubuntu-latest
51+
runs-on: ubuntu-24.04
5252
steps:
5353
- name: Set up Docker Buildx
5454
uses: docker/setup-buildx-action@v3
@@ -67,4 +67,4 @@ jobs:
6767
6868
- name: Inspect image
6969
run: |
70-
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:nightly
70+
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:nightly

.github/workflows/npmPublish.yml renamed to .github/workflows/npm-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ on:
55

66
jobs:
77
build:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-24.04
99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
with:
1313
ref: ${{ github.ref }}
1414

1515
- name: Set up Node.js
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: "18"
1919
cache: "yarn"

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ on:
1212
jobs:
1313
stale:
1414

15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616
permissions:
1717
issues: write
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/stale@v5
21+
- uses: actions/stale@v9
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
stale-pr-message: 'This PR is stale because it has been open for 7 days with no activity. Remove stale label or comment or this PR will be closed in 3 days.'

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ web_modules/
5454
# Optional npm cache directory
5555
.npm
5656

57-
# Optional eslint cache
58-
.eslintcache
59-
6057
# Optional stylelint cache
6158
.stylelintcache
6259

@@ -152,3 +149,6 @@ https
152149
# Auto generated OpenAPI file
153150
openapi.json
154151
.aider*
152+
153+
# Jetbrains IDEs
154+
.idea

.vscode/settings.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)