Skip to content

Commit

Permalink
Merge pull request #272 from dojoengine/fix/submodule
Browse files Browse the repository at this point in the history
fix: submodule
  • Loading branch information
ponderingdemocritus authored Sep 25, 2024
2 parents b99ba00 + 41a0bf0 commit b8a3792
Show file tree
Hide file tree
Showing 43 changed files with 1,313 additions and 1,301 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
run: git submodule update --init --recursive

- run: curl -L https://install.dojoengine.org | bash
- run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.6
- run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.12
- run: |
cd examples/dojo/dojo-starter
cd worlds/dojo-starter
/home/runner/.config/.dojo/bin/sozo build
/home/runner/.config/.dojo/bin/sozo test
Expand All @@ -41,10 +41,7 @@ jobs:
run: pnpm run prettier --check .

- name: Build packages
run: pnpm run build && pnpm run build-examples

- name: Run tests
run: pnpm run test
run: pnpm run build

# - name: Upload coverage reports to Codecov
# uses: codecov/codecov-action@v3
Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/release-minor.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/release-preminor.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/release-prepatch.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/release-prerelease.yaml

This file was deleted.

57 changes: 57 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Release

on:
workflow_dispatch:
inputs:
release_type:
description: "Type of release (prerelease, prepatch, patch, minor, preminor, major)"
required: true
default: "patch"

jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: pnpm/action-setup@v3
with:
version: 8

- name: Configure Git
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
- name: "Setup npm for npmjs"
run: |
npm config set registry https://registry.npmjs.org/
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
- name: Install Protobuf Compiler
run: sudo apt-get install -y protobuf-compiler

- name: Install dependencies
run: pnpm install

- name: Build packages
run: pnpm run build

- name: Tag and Publish Packages
run: |
npx lerna version ${{ github.event.inputs.release_type }} --conventional-commits --yes --no-private --force-publish
npx lerna publish from-git --yes --dist-tag ${{ github.event.inputs.release_type == 'preminor' && 'next' || 'latest' }}
- name: Generate Changelog
run: |
npx lerna-changelog > CHANGELOG.md
- name: Commit and Push Changelog
run: |
git add CHANGELOG.md
git commit -m "chore(release): update changelog [skip ci]"
git push origin HEAD:${{ github.ref }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36 changes: 0 additions & 36 deletions .github/workflows/release_patch.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "dojo-starter"]
path = examples/dojo-starter
path = worlds/dojo-starter
url = https://github.com/dojoengine/dojo-starter
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ packages/torii-client/pkg
packages/torii-wasm/pkg/
packages/utils-wasm/pkg/

examples/dojo-starter
packages/create-dojo
worlds/dojo-starter

# ignore lock files
**/*-lock.yaml
Expand Down
28 changes: 14 additions & 14 deletions examples/example-nodejs-bot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
"type": "module",
"main": "dist/src/server.js",
"devDependencies": {
"@graphql-codegen/cli": "^5.0.0",
"@graphql-codegen/typescript": "^4.0.1",
"@graphql-codegen/typescript-graphql-request": "^6.0.0",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@types/express": "^4.17.17",
"@types/node": "^20.11.10",
"@types/node-cron": "^3.0.10",
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/typescript": "^4.0.9",
"@graphql-codegen/typescript-graphql-request": "^6.2.0",
"@graphql-codegen/typescript-operations": "^4.2.3",
"@types/express": "^4.17.21",
"@types/node": "^20.16.6",
"@types/node-cron": "^3.0.11",
"bun-types": "latest",
"graphql": "^16.8.1",
"graphql": "^16.9.0",
"graphql-request": "^6.1.0"
},
"dependencies": {
"@dojoengine/core": "workspace:*",
"@pinecone-database/pinecone": "^1.1.2",
"@pinecone-database/pinecone": "^1.1.3",
"@sapphire/decorators": "^6.1.0",
"@sapphire/framework": "^5.2.1",
"discord.js": "^14.16.2",
"express": "^4.18.2",
"express": "^4.21.0",
"graphql-tag": "^2.12.6",
"langchain": "^0.0.200",
"node-cron": "^3.0.2",
"openai": "^4.20.1",
"twitter-api-v2": "^1.15.2",
"typescript": "^5.2.2"
"node-cron": "^3.0.3",
"openai": "^4.63.0",
"twitter-api-v2": "^1.17.2",
"typescript": "^5.6.2"
},
"scripts": {
"build": "tsc",
Expand Down
8 changes: 4 additions & 4 deletions examples/example-vanillajs-phaser-recs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"preview": "vite preview"
},
"devDependencies": {
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite-plugin-top-level-await": "^1.4.2",
"typescript": "^5.6.2",
"vite": "^5.4.7",
"vite-plugin-top-level-await": "^1.4.4",
"vite-plugin-wasm": "^3.3.0"
},
"dependencies": {
Expand All @@ -21,7 +21,7 @@
"@dojoengine/state": "workspace:*",
"@dojoengine/torii-client": "workspace:*",
"@dojoengine/utils": "workspace:*",
"@latticexyz/utils": "^2.0.12",
"@latticexyz/utils": "^2.2.8",
"noise": "^0.0.0",
"phaser": "3.60.0-beta.14",
"starknet": "6.11.0"
Expand Down
36 changes: 18 additions & 18 deletions examples/example-vite-react-app-recs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@
"@dojoengine/state": "workspace:*",
"@dojoengine/torii-client": "workspace:*",
"@dojoengine/utils": "workspace:*",
"@latticexyz/react": "^2.0.12",
"@latticexyz/utils": "^2.0.12",
"@latticexyz/react": "^2.2.8",
"@latticexyz/utils": "^2.2.8",
"ethers": "^5.7.2",
"mobx": "^6.9.0",
"mobx": "^6.13.2",
"proxy-deep": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rxjs": "^7.8.1",
"starknet": "6.11.0",
"vite-plugin-top-level-await": "^1.3.1",
"vite-plugin-wasm": "^3.2.2"
"vite-plugin-top-level-await": "^1.4.4",
"vite-plugin-wasm": "^3.3.0"
},
"devDependencies": {
"@types/node": "^20.4.8",
"@types/react": "^18.2.33",
"@types/react-dom": "^18.0.11",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"@vitejs/plugin-react": "^4.0.0",
"eslint": "^8.38.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.3.4",
"typescript": "^5.5.4",
"vite": "^4.3.9"
"@types/node": "^20.16.6",
"@types/react": "^18.3.9",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.3.5",
"typescript": "^5.6.2",
"vite": "^4.5.5"
}
}
Loading

0 comments on commit b8a3792

Please sign in to comment.