Skip to content

Commit b8a3792

Browse files
Merge pull request #272 from dojoengine/fix/submodule
fix: submodule
2 parents b99ba00 + 41a0bf0 commit b8a3792

File tree

43 files changed

+1313
-1301
lines changed

Some content is hidden

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

43 files changed

+1313
-1301
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
run: git submodule update --init --recursive
2121

2222
- run: curl -L https://install.dojoengine.org | bash
23-
- run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.6
23+
- run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.12
2424
- run: |
25-
cd examples/dojo/dojo-starter
25+
cd worlds/dojo-starter
2626
/home/runner/.config/.dojo/bin/sozo build
2727
/home/runner/.config/.dojo/bin/sozo test
2828
@@ -41,10 +41,7 @@ jobs:
4141
run: pnpm run prettier --check .
4242

4343
- name: Build packages
44-
run: pnpm run build && pnpm run build-examples
45-
46-
- name: Run tests
47-
run: pnpm run test
44+
run: pnpm run build
4845

4946
# - name: Upload coverage reports to Codecov
5047
# uses: codecov/codecov-action@v3

.github/workflows/release-minor.yaml

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

.github/workflows/release-preminor.yaml

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

.github/workflows/release-prepatch.yaml

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

.github/workflows/release-prerelease.yaml

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

.github/workflows/release.yaml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release_type:
7+
description: "Type of release (prerelease, prepatch, patch, minor, preminor, major)"
8+
required: true
9+
default: "patch"
10+
11+
jobs:
12+
release:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- uses: pnpm/action-setup@v3
20+
with:
21+
version: 8
22+
23+
- name: Configure Git
24+
run: |
25+
git config user.name "${{ github.actor }}"
26+
git config user.email "${{ github.actor }}@users.noreply.github.com"
27+
28+
- name: "Setup npm for npmjs"
29+
run: |
30+
npm config set registry https://registry.npmjs.org/
31+
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
32+
33+
- name: Install Protobuf Compiler
34+
run: sudo apt-get install -y protobuf-compiler
35+
36+
- name: Install dependencies
37+
run: pnpm install
38+
39+
- name: Build packages
40+
run: pnpm run build
41+
42+
- name: Tag and Publish Packages
43+
run: |
44+
npx lerna version ${{ github.event.inputs.release_type }} --conventional-commits --yes --no-private --force-publish
45+
npx lerna publish from-git --yes --dist-tag ${{ github.event.inputs.release_type == 'preminor' && 'next' || 'latest' }}
46+
47+
- name: Generate Changelog
48+
run: |
49+
npx lerna-changelog > CHANGELOG.md
50+
51+
- name: Commit and Push Changelog
52+
run: |
53+
git add CHANGELOG.md
54+
git commit -m "chore(release): update changelog [skip ci]"
55+
git push origin HEAD:${{ github.ref }}
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_patch.yaml

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

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "dojo-starter"]
2-
path = examples/dojo-starter
2+
path = worlds/dojo-starter
33
url = https://github.com/dojoengine/dojo-starter

.prettierignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ packages/torii-client/pkg
55
packages/torii-wasm/pkg/
66
packages/utils-wasm/pkg/
77

8-
examples/dojo-starter
9-
packages/create-dojo
8+
worlds/dojo-starter
109

1110
# ignore lock files
1211
**/*-lock.yaml

examples/example-nodejs-bot/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44
"type": "module",
55
"main": "dist/src/server.js",
66
"devDependencies": {
7-
"@graphql-codegen/cli": "^5.0.0",
8-
"@graphql-codegen/typescript": "^4.0.1",
9-
"@graphql-codegen/typescript-graphql-request": "^6.0.0",
10-
"@graphql-codegen/typescript-operations": "^4.0.1",
11-
"@types/express": "^4.17.17",
12-
"@types/node": "^20.11.10",
13-
"@types/node-cron": "^3.0.10",
7+
"@graphql-codegen/cli": "^5.0.2",
8+
"@graphql-codegen/typescript": "^4.0.9",
9+
"@graphql-codegen/typescript-graphql-request": "^6.2.0",
10+
"@graphql-codegen/typescript-operations": "^4.2.3",
11+
"@types/express": "^4.17.21",
12+
"@types/node": "^20.16.6",
13+
"@types/node-cron": "^3.0.11",
1414
"bun-types": "latest",
15-
"graphql": "^16.8.1",
15+
"graphql": "^16.9.0",
1616
"graphql-request": "^6.1.0"
1717
},
1818
"dependencies": {
1919
"@dojoengine/core": "workspace:*",
20-
"@pinecone-database/pinecone": "^1.1.2",
20+
"@pinecone-database/pinecone": "^1.1.3",
2121
"@sapphire/decorators": "^6.1.0",
2222
"@sapphire/framework": "^5.2.1",
2323
"discord.js": "^14.16.2",
24-
"express": "^4.18.2",
24+
"express": "^4.21.0",
2525
"graphql-tag": "^2.12.6",
2626
"langchain": "^0.0.200",
27-
"node-cron": "^3.0.2",
28-
"openai": "^4.20.1",
29-
"twitter-api-v2": "^1.15.2",
30-
"typescript": "^5.2.2"
27+
"node-cron": "^3.0.3",
28+
"openai": "^4.63.0",
29+
"twitter-api-v2": "^1.17.2",
30+
"typescript": "^5.6.2"
3131
},
3232
"scripts": {
3333
"build": "tsc",

0 commit comments

Comments
 (0)