Skip to content

Commit

Permalink
Merge pull request #37 from esnya/beta
Browse files Browse the repository at this point in the history
U#1.1 Upgrade
  • Loading branch information
esnya authored Feb 17, 2023
2 parents 1a7ae97 + b4e5b58 commit 85ef70c
Show file tree
Hide file tree
Showing 284 changed files with 33,024 additions and 37,615 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.prefab filter=usharp-prefab diff=usharp-prefab merge=unityyamlmerge eol=lf text
*.asset filter=usharp-prefab diff=usharp-prefab merge=unityyamlmerge eol=lf text
10 changes: 10 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[filter "usharp-prefab"]
smudge = node .gitscripts/filter-usharp-prefab.js
clean = node .gitscripts/filter-usharp-prefab.js

[diff "usharp-prefab"]
textconv = node .gitscripts/filter-usharp-prefab.js

[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = 'C:\\Program Files\\Unity\\Hub\\Editor\\2019.4.31f1\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
10 changes: 0 additions & 10 deletions .github/scripts/before-release.sh

This file was deleted.

58 changes: 7 additions & 51 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,14 @@
name: Release Unity Package

on:
- push

name: Release
on: push
jobs:
prebuild:
runs-on: ubuntu-latest
outputs:
package_name: ${{steps.package_name.outputs.package_name}}
steps:
- id: package_name
run: echo "::set-output name=package_name::$(echo ${GITHUB_REPOSITORY##*/})-$(echo ${GITHUB_REF#refs/*/})" | sed 's#/#-#g'

build:
needs: prebuild
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: |
find Assets -name \*.meta > metaList
mkdir dist
cat metaList
- uses: pCYSl5EDgo/create-unitypackage@master
with:
package-path: 'dist/${{needs.prebuild.outputs.package_name}}.unitypackage'
include-files: metaList
- name: Upload package artifacts
uses: actions/upload-artifact@v2
with:
name: '${{needs.prebuild.outputs.package_name}}.unitypackage'
path: 'dist/${{needs.prebuild.outputs.package_name}}.unitypackage'
if-no-files-found: error

release:
needs:
- prebuild
- build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '14'
- name: Install dependencies
run: npm install semantic-release semantic-release-gitmoji @semantic-release/exec @semantic-release/github
- name: Download artifacts
uses: actions/download-artifact@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
path: dist/
- run: |
echo '{"plugins": ["semantic-release-gitmoji", ["@semantic-release/exec", {"verifyReleaseCmd": "./.github/scripts/before-release.sh ${nextRelease.version}"}],["@semantic-release/github",{"assets": {"path": "dist/"}}]]}' > .releaserc
- run: cat .releaserc
- name: Release
node-version: lts/*
- run: npm ci
- run: npx semantic-release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npx semantic-release
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,11 @@ sysinfo.txt
# Crashlytics generated file
crashlytics-build.properties

LightingData.asset*
Lightmap-*.png*
Lightmap-*.exr*
Lightmap-*.png*
ReflectionProbe-*.exr*

/dist

28 changes: 28 additions & 0 deletions .gitscripts/filter-usharp-prefab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
const fs = require("fs");

const guidPattern = '\\{fileID: .*(\n *type: [0-9]+)?\\}';
const pattern = new RegExp(
[
` - target: ${guidPattern}\n`,
" propertyPath: (serializedProgramAsset|serializationData\\..*)\n",
" value:.*\n",
` objectReference: ${guidPattern}\n`,
"|",
` serialized(Udon)?ProgramAsset: ${guidPattern}\n`,
"|",
` serializedProgramBytesString: .*\n?`,
"|",
" SerializedFormat: [02]\n",
].join(""),
"mg"
);

const input = process.argv[2]
? fs.createReadStream(process.argv[2])
: process.stdin;

const chunks = [];
input.on("data", (chunk) => chunks.push(chunk));
input.on("end", () => {
process.stdout.write(Buffer.concat(chunks).toString().replace(pattern, ""));
});
5 changes: 5 additions & 0 deletions .releaserc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
plugins:
- semantic-release-gitmoji
- "@semantic-release/npm"
- "@semantic-release/github"
- "@semantic-release/git"
2 changes: 0 additions & 2 deletions Assets/.gitignore

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 85ef70c

Please sign in to comment.