Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(protocol squad) main branch pr #793

Draft
wants to merge 49 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2dadadd
publish to @dcl/sdk@protocol-squad
leanmendoza Oct 17, 2023
6a20452
expose avatar components
leanmendoza Oct 17, 2023
545093a
update playground.md
leanmendoza Oct 17, 2023
36dcbee
Merge branch 'main' into protocol-squad
leanmendoza Nov 2, 2023
35accf0
(testing framework) comment yield
leanmendoza Nov 2, 2023
a8c3cd5
Merge branch 'main' into protocol-squad
leanmendoza Nov 29, 2023
7fc7d71
Merge branch 'main' into protocol-squad
leanmendoza Dec 21, 2023
fb63e94
Merge remote-tracking branch 'origin/main' into protocol-squad
leanmendoza Feb 29, 2024
bd3fac0
restore to menduz odish
leanmendoza Feb 29, 2024
a97f295
Merge branch 'main' into protocol-squad
leanmendoza Apr 9, 2024
5d33fb5
Merge branch 'main' into protocol-squad
leanmendoza May 7, 2024
7fb993b
Merge branch 'main' into protocol-squad
leanmendoza May 13, 2024
2830ae0
feat: add bevy in start command (#944)
leanmendoza May 25, 2024
434e1d1
experimental cinematic camera (#949)
leanmendoza May 25, 2024
dac9f43
Merge branch 'main' into protocol-squad
leanmendoza May 25, 2024
6ccc16a
fix tests
leanmendoza May 25, 2024
39507e9
fix --preview for bevy
leanmendoza May 25, 2024
33086e2
feat: add `opacity`, `outline` and `textWrapping` (UIText) (#946)
leanmendoza May 27, 2024
7b1f3b6
spawn by default dao explroer
leanmendoza May 27, 2024
914ff11
Revert "DevExp improvements (#950)"
leanmendoza May 27, 2024
ae5e11c
bump bevy
leanmendoza May 30, 2024
79f1abd
wip
leanmendoza Jun 4, 2024
572e26c
Revert "Revert "DevExp improvements (#950)""
leanmendoza Jun 27, 2024
8339e75
Merge remote-tracking branch 'origin/main' into temp
leanmendoza Jun 27, 2024
ae2c485
Merge remote-tracking branch 'origin/experimenta/scroll' into temp
leanmendoza Jun 27, 2024
e4f9550
fix
leanmendoza Jun 27, 2024
1279a29
bump bevy
leanmendoza Jun 27, 2024
a2ad437
fix test
leanmendoza Jun 29, 2024
1436730
Merge branch 'main' into protocol-squad
leanmendoza Jul 11, 2024
1578bcd
experimental gltf node (#973)
leanmendoza Jul 30, 2024
f1c099d
Merge branch 'main' into protocol-squad
leanmendoza Jul 30, 2024
5984328
bump protocol and bevy, fix tests
leanmendoza Jul 30, 2024
66d4cdc
fix playground-assets
leanmendoza Jul 30, 2024
e38a9d0
bump bevy explorer version
leanmendoza Aug 4, 2024
9214235
fix: share dependency across projects in a workspace
leanmendoza Aug 4, 2024
91839fa
bump bevy explorer
leanmendoza Aug 8, 2024
087715b
Merge branch 'main' into protocol-squad
leanmendoza Aug 8, 2024
1be6793
fix
leanmendoza Aug 8, 2024
0959ddd
Merge branch 'main' into protocol-squad
leanmendoza Sep 18, 2024
4bab6bf
feat-experimental: in world UI and lights (#1004)
leanmendoza Sep 20, 2024
935bb64
chore: bump bevy-explorer
leanmendoza Oct 23, 2024
bf2b553
Merge remote-tracking branch 'origin/main' into protocol-squad
leanmendoza Oct 24, 2024
234eaa0
fix
leanmendoza Oct 25, 2024
94b28bf
fix
leanmendoza Oct 25, 2024
96be187
bump bevy explorer
leanmendoza Nov 13, 2024
c9ef0d5
Merge remote-tracking branch 'origin/main' into protocol-squad
leanmendoza Nov 15, 2024
759139d
Merge remote-tracking branch 'origin/main' into protocol-squad
leanmendoza Dec 19, 2024
e5e030c
fix update
leanmendoza Dec 19, 2024
e43db63
add msg inspector
leanmendoza Dec 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
types:
- created

env:
IS_A_PR: ${{ github.event.pull_request.number != 'null' && github.head_ref != 'protocol-squad' }}

name: CI
jobs:
lint:
Expand Down Expand Up @@ -100,6 +103,13 @@ jobs:
decentraland_js_runtime_s3_bucket_key: ${{ steps.publish_dcl_js_runtime.outputs.s3-bucket-key }}
decentraland_ecs_bucket_key: ${{ steps.publish_ecs.outputs.s3-bucket-key }}
steps:
- name: (PR) Check if it's a PR
if: ${{ env.IS_A_PR == 'true' }}
run: |
echo "run from a PR"
echo "from env '${{env.IS_A_PR}}'"
echo "- '${{github.event.pull_request.number}}'"
echo "- env '${{github.head_ref}}'"
- uses: actions/checkout@master
- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -135,6 +145,8 @@ jobs:
uses: menduz/oddish-action@master
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/js-runtime
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -146,6 +158,7 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}/@dcl/js-runtime'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}
Expand All @@ -155,6 +168,8 @@ jobs:
id: publish_ecs
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/ecs
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -166,13 +181,14 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}/@dcl/ecs'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}

- name: (PR) change @dcl/react-ecs dependencies versions to point to s3 url
working-directory: ./packages/@dcl/react-ecs
if: ${{ github.event.pull_request.number }}
if: ${{ env.IS_A_PR == 'true' }}
run: |
node -e "\
let pkg=require('./package.json');\
Expand All @@ -187,6 +203,8 @@ jobs:
uses: menduz/oddish-action@master
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/react-ecs
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -198,6 +216,7 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}/@dcl/react-ecs'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}
Expand All @@ -207,6 +226,8 @@ jobs:
id: publish_decentraland_inspector
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/inspector
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -218,13 +239,14 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}/@dcl/inspector'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}

- name: (PR) change @dcl/sdk-commands dependencies versions to point to s3 url
working-directory: ./packages/@dcl/sdk-commands
if: ${{ github.event.pull_request.number }}
if: ${{ env.IS_A_PR == 'true' }}
run: |
node -e "\
let pkg=require('./package.json');\
Expand All @@ -241,6 +263,8 @@ jobs:
id: publish_decentraland_sdk_commands
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/sdk-commands
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -252,13 +276,14 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}

- name: (PR) change @dcl/sdk version to s3 url
working-directory: ./packages/@dcl/sdk
if: ${{ github.event.pull_request.number }}
if: ${{ env.IS_A_PR == 'true' }}
run: |
node -e "\
let pkg=require('./package.json');\
Expand All @@ -282,6 +307,8 @@ jobs:
id: publish_decentraland_sdk
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/sdk
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -293,6 +320,7 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}
Expand All @@ -308,6 +336,8 @@ jobs:
id: publish_playground_assets
with:
registry-url: 'https://registry.npmjs.org'
custom-tag: protocol-squad
branch-to-custom-tag: protocol-squad
access: public
cwd: ./packages/@dcl/playground-assets
## use action runId instead of current date to generate snapshot numbers
Expand All @@ -319,12 +349,13 @@ jobs:
s3-bucket-region: ${{ secrets.SDK_TEAM_AWS_REGION }}
s3-bucket-key-prefix: '@dcl/js-sdk-toolchain/branch/${{ github.head_ref || github.ref }}'
env:
BRANCH_NAME: ${{ github.head_ref }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.SDK_TEAM_AWS_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SDK_TEAM_AWS_SECRET }}
notify_deployment:
needs: [build]
if: ${{ github.event.pull_request.number }}
if: github.event.pull_request.number != 'null' && github.head_ref != 'protocol-squad'
runs-on: ubuntu-latest
name: Deployment Notification
steps:
Expand Down
Loading
Loading