Skip to content

Commit

Permalink
Merge pull request #4 from VRLabs/dev
Browse files Browse the repository at this point in the history
Cleanup
  • Loading branch information
Cibbi authored Feb 26, 2024
2 parents 9fad147 + 33f6cfe commit 019372b
Show file tree
Hide file tree
Showing 37 changed files with 1,054 additions and 754 deletions.
84 changes: 84 additions & 0 deletions .github/workflows/VRC-Asset-Release-And-Upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: VRC Asset Release and Listing Upload
on:
push:
tags:
- "*.*.*"

env:
ASSETS_PATH: .
RELEASE_PATH: Packages
ARTIFACT_DURATION: 30 # In days
UPLOAD_ENDPOINT: https://api.vrlabs.dev/packages/add
WORKFLOW_VERSION: 1.0.0

jobs:
build:
runs-on: "ubuntu-latest"
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Check if package.json exists
run: |
if [ ! -f package.json ]; then
echo "package.json not found"
exit 1
fi
- name: Get package.json
id: get_package_json
run: |
{
echo 'package_json<<"""'
echo $(cat package.json)
echo '"""'
} >> $GITHUB_OUTPUT
- name: Get needed Data
id: job_data
run: |
version=$(echo "${{ github.ref_name }}")
version=$(echo $version | tr '[:upper:]' '[:lower:]')
echo "version=$version" >> $GITHUB_OUTPUT
major_version=$(echo $version | cut -d '.' -f 1)
minor_version=$(echo $version | cut -d '.' -f 2)
echo "major_version=$major_version" >> $GITHUB_OUTPUT
echo "minor_version=$minor_version" >> $GITHUB_OUTPUT
name="${{ fromJson(steps.get_package_json.outputs.package_json).name }}"
display_name="${{ fromJson(steps.get_package_json.outputs.package_json).displayName }}"
echo "package_name=$name" >> $GITHUB_OUTPUT
echo "package_display_name=$display_name" >> $GITHUB_OUTPUT
- name: Create Packages
id: create_packages
uses: VRLabs/VRCTools-Packaging-Action@v1
with:
path: '${{ env.ASSETS_PATH }}'
outputPath: '${{ env.RELEASE_PATH }}'
releaseUrl: 'https://github.com/${{ github.repository }}/releases/download/${{ steps.job_data.outputs.version }}/${{ steps.job_data.outputs.package_name }}-${{ steps.job_data.outputs.version }}.zip'
unityReleaseUrl: 'https://github.com/${{ github.repository }}/releases/download/${{ steps.job_data.outputs.version }}/${{ steps.job_data.outputs.package_name }}-${{ steps.job_data.outputs.version }}.unitypackage'
releaseVersion: '${{ steps.job_data.outputs.version }}'

- name: Create Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
name: "${{ steps.job_data.outputs.package_display_name }} ${{ steps.job_data.outputs.version }}"
files: |
${{ steps.create_packages.outputs.unityPackagePath }}
${{ steps.create_packages.outputs.vccPackagePath }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SOURCE_TAG: ${{ steps.job_data.outputs.version }}

- name: Add server-json to Artifacts
uses: actions/upload-artifact@v3
with:
name: server-json
path: ${{ steps.create_packages.outputs.serverPackageJsonPath }}
retention-days: ${{ env.ARTIFACT_DURATION }}

- name: Send package info to a server
run: |
curl -X POST -H "Content-Type: application/json" -H "Vrl-Api-Key: ${{ secrets.LISTINGS_API_KEY }}" --data @${{ steps.create_packages.outputs.serverPackageJsonPath }} ${{ env.UPLOAD_ENDPOINT }} || exit 0
shell: bash
58 changes: 0 additions & 58 deletions .github/workflows/create-release.yml

This file was deleted.

30 changes: 15 additions & 15 deletions FX.controller → Contact Tracker FX.controller
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Reset Tracker
m_Name: Tracker Reset
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
Expand Down Expand Up @@ -239,60 +239,60 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FX
m_Name: Contact Tracker FX
serializedVersion: 5
m_AnimatorParameters:
- m_Name: ContactTracker/Control
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/X+
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/X-
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/Y+
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/Y-
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/Z+
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/Z-
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ContactTracker/Size
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Tracker Control
m_Name: Contact Tracker Control
m_StateMachine: {fileID: 6579965920562694768}
m_Mask: {fileID: 0}
m_Motions: []
Expand All @@ -304,7 +304,7 @@ AnimatorController:
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Tracker Blend Tree
m_Name: Contact Tracker Blend Tree
m_StateMachine: {fileID: 9126931852697489125}
m_Mask: {fileID: 0}
m_Motions: []
Expand Down Expand Up @@ -443,14 +443,14 @@ AnimatorStateMachine:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Tracker Control
m_Name: Contact Tracker Control
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -9104728529232961903}
m_Position: {x: 30, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: 2074266605032204707}
m_Position: {x: 30, y: 320, z: 0}
m_Position: {x: 150, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 6109795355817464234}
m_Position: {x: -90, y: 250, z: 0}
Expand Down Expand Up @@ -514,7 +514,7 @@ AnimatorStateMachine:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Tracker Blend Tree
m_Name: Contact Tracker Blend Tree
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -7025210188980449939}
Expand Down
File renamed without changes.
Loading

0 comments on commit 019372b

Please sign in to comment.