Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mifiamigahna committed Nov 30, 2022
2 parents c4898ea + 0229017 commit a212ebd
Show file tree
Hide file tree
Showing 8 changed files with 237 additions and 449 deletions.
96 changes: 66 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,44 +154,39 @@ jobs:
dotnet build ${{ env.PROJECT_DIR }}/${{ env.PROJECT_NAME }}.sln
./dotnet-sonarscanner end /d:sonar.login=${{ secrets.SONAR_TOKEN }}
release:
name: Release
version:
name: Version
runs-on: ubuntu-latest
outputs:
releaseCreated: ${{ steps.release.outputs.new-release-published }}
uploadUrl: ${{ steps.getUploadUrl.outputs.uploadUrl }}
version: ${{ steps.release.outputs.release-version }}
version: ${{ steps.version.outputs.release-version }}
releaseCreated: ${{ steps.version.outputs.new-release-published }}
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Create release
- name: Calculate version
uses: docker://ghcr.io/codfish/semantic-release-action:latest
id: release
id: version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_format: 'v${version}'
branches: |
[
'master'
]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Get upload URL
if: ${{ steps.release.outputs.new-release-published == 'true' }}
id: getUploadUrl
env:
VERSION: ${{ steps.release.outputs.release-version }}
dry_run: true

- name: Log outputs
run: |
echo "getting upload url for release $VERSION with tag v$VERSION"
uploadUrl=$(curl -sL https://api.github.com/repos/${{ github.repository }}/releases/tags/v$VERSION | jq -r '.upload_url')
echo uploadUrl=$uploadUrl >> $GITHUB_OUTPUT
echo "version: ${{ steps.version.outputs.release-version }}"
echo "releaseCreated: ${{ steps.version.outputs.new-release-published }}"
build:
name: Build
runs-on: ubuntu-latest
needs: release
if: ${{ needs.release.outputs.releaseCreated == 'true' }}
needs: version
if: ${{ needs.version.outputs.releaseCreated == 'true' }}
strategy:
matrix:
buildTarget: ["StandaloneWindows64", "StandaloneOSX", "StandaloneLinux64"]
Expand Down Expand Up @@ -230,15 +225,57 @@ jobs:
targetPlatform: ${{ matrix.buildTarget }}
projectPath: ${{ env.PROJECT_DIR }}
buildName: ${{ env.PROJECT_NAME }}
buildsPath: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}
versioning: None
buildsPath: Builds
versioning: Custom
version: ${{ needs.version.outputs.version }}

- name: Move build
run: |
ls -la
ls -la Builds
ls -la Builds/${{ matrix.buildTarget }}
sudo mv Builds/${{ matrix.buildTarget }} ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}
- name: Upload build
uses: actions/upload-artifact@v2
with:
name: Build-${{ matrix.buildTarget }}
name: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}
path: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}

release:
name: Release
runs-on: ubuntu-latest
needs: build
outputs:
releaseCreated: ${{ steps.release.outputs.new-release-published }}
uploadUrl: ${{ steps.getUploadUrl.outputs.uploadUrl }}
version: ${{ steps.release.outputs.release-version }}
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Create release
uses: docker://ghcr.io/codfish/semantic-release-action:latest
id: release
with:
tag_format: 'v${version}'
branches: |
[
'master'
]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Get upload URL
if: ${{ steps.release.outputs.new-release-published == 'true' }}
id: getUploadUrl
env:
VERSION: ${{ steps.release.outputs.release-version }}
run: |
echo "getting upload url for release $VERSION with tag v$VERSION"
uploadUrl=$(curl -sL https://api.github.com/repos/${{ github.repository }}/releases/tags/v$VERSION | jq -r '.upload_url')
echo uploadUrl=$uploadUrl >> $GITHUB_OUTPUT
upload:
name: Upload
runs-on: ubuntu-latest
Expand All @@ -255,22 +292,21 @@ jobs:
- name: Download build
uses: actions/download-artifact@v2
with:
name: Build-${{ matrix.buildTarget }}
path: Build
name: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}
path: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}

- name: Zip build
run: |
zip -r ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}.zip Build/*
- name: Upload URL
run: echo ${{ needs.release.outputs.uploadUrl }}
zip -r ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}.zip ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}/*
- name: Upload build
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.release.outputs.uploadUrl }}
asset_path: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}.zip
asset_name: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}
asset_name: ${{ env.PROJECT_NAME }}-${{ matrix.buildTarget }}.zip
asset_content_type: application/zip

- name: Upload to itch.io
Expand Down
163 changes: 163 additions & 0 deletions TanksOnAPlain/Assets/Prefabs/Graphics/floating_text.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5736488315374214953
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3395130341528113002}
- component: {fileID: 1326310669791843346}
- component: {fileID: 1261725686654313034}
- component: {fileID: 5619235454581232626}
m_Layer: 0
m_Name: floating_text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3395130341528113002
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736488315374214953}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1326310669791843346
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736488315374214953}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5155f415675e4186b565aed87d7da4ba, type: 3}
m_Name:
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects:
- {fileID: 11400000, guid: 47f2705f8dbb77b429dffbb05c548e8c, type: 2}
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: FloatingTextAsset
Entry: 10
Data: 0
--- !u!222 &1261725686654313034
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736488315374214953}
m_CullTransparentMesh: 1
--- !u!114 &5619235454581232626
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736488315374214953}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Debug
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7151dbbc94d5a04498ceab0f167632af, type: 2}
m_sharedMaterial: {fileID: 6544489407505262915, guid: 7151dbbc94d5a04498ceab0f167632af, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 0.5
m_fontSizeBase: 0.5
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 4096
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
Loading

0 comments on commit a212ebd

Please sign in to comment.