Skip to content

Commit 12dc4b4

Browse files
authored
Merge pull request #95 from SideQuestVR/dev
2.6.1
2 parents 7b1db49 + dd63478 commit 12dc4b4

File tree

3,536 files changed

+122
-153
lines changed

Some content is hidden

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

3,536 files changed

+122
-153
lines changed

.github/workflows/publish.yml

+3-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Publish Package
22
on:
33
workflow_dispatch:
44

@@ -19,36 +19,15 @@ jobs:
1919
TAG=$(jq -r '.version' package.json)
2020
echo "TAG=$TAG" >> $GITHUB_ENV
2121
if git rev-parse $TAG >/dev/null 2>&1; then
22+
echo "TAG_EXISTS=true" >> $GITHUB_ENV
2223
echo "::error::Tag already exists: $TAG"
2324
exit 1
2425
else
2526
echo "TAG_EXISTS=false" >> $GITHUB_ENV
2627
fi
2728
28-
- name: Publish on UPM branch
29-
run: |
30-
if [[ -d "Samples" ]]; then
31-
git mv Samples Samples~
32-
rm -f Samples.meta
33-
fi
34-
35-
mkdir ../upm
36-
cp -r . ../upm
37-
rm -rf ../upm/.git # don't want to replace git history!
38-
39-
git reset --hard HEAD
40-
git checkout upm
41-
42-
cp -r ../upm/* .
43-
rm -rf ../upm
44-
45-
git config --global user.name 'github-bot'
46-
git config --global user.email '[email protected]'
47-
git commit -am "$TAG" --no-verify
48-
git push -u origin upm
49-
5029
- name: Create Release
5130
if: env.TAG_EXISTS == 'false'
5231
run: |
53-
git tag ${{ env.TAG }} upm
32+
git tag ${{ env.TAG }} main
5433
git push origin --tags

Samples.meta

-8
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Samples/FlexaWorld/Assets/Debug.meta Samples~/FlexaWorld/Assets/Debug.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugBlack.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugBlack.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugBlue.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugBlue.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugGreen.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugGreen.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugLeft.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugLeft.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugNode.prefab.meta Samples~/FlexaWorld/Assets/Debug/DebugNode.prefab.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugRed.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugRed.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugRight.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugRight.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugTRGreen.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugTRGreen.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugTRPink.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugTRPink.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugTRRed.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugTRRed.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugWhite.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugWhite.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/DebugYellow.mat.meta Samples~/FlexaWorld/Assets/Debug/DebugYellow.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/Hands.meta Samples~/FlexaWorld/Assets/Debug/Hands.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/Hands/LeftPhysHand.mat.meta Samples~/FlexaWorld/Assets/Debug/Hands/LeftPhysHand.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/Hands/RightPhysHand.mat.meta Samples~/FlexaWorld/Assets/Debug/Hands/RightPhysHand.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/LocoBall.meta Samples~/FlexaWorld/Assets/Debug/LocoBall.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/LocoBall/LocoBall.mat.meta Samples~/FlexaWorld/Assets/Debug/LocoBall/LocoBall.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/LocoBall/LocoBall.png.meta Samples~/FlexaWorld/Assets/Debug/LocoBall/LocoBall.png.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/LocoBall/LocoBall1.png.meta Samples~/FlexaWorld/Assets/Debug/LocoBall/LocoBall1.png.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Samples/FlexaWorld/Assets/Debug/LocoBall/LocoShock.mat.meta Samples~/FlexaWorld/Assets/Debug/LocoBall/LocoShock.mat.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)