Skip to content

Commit

Permalink
Merge pull request #113 from finol-digital/develop
Browse files Browse the repository at this point in the history
v1.97
  • Loading branch information
davidmfinol authored Dec 2, 2023
2 parents 145abc4 + a306e06 commit d20b7c3
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 26 deletions.
47 changes: 36 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,6 @@ jobs:
Library-buildWindows-
- name: Build Unity Project
id: build
continue-on-error: true
timeout-minutes: 45
uses: game-ci/unity-builder@main
env:
Expand Down Expand Up @@ -540,11 +539,12 @@ jobs:
overwrite: true
body: ${{ github.event.release.body }}

deployToMicrosoftStore:
name: Deploy to the Microsoft Store
buildWSAPlayer:
name: Build for WSAPlayer
runs-on: windows-2022
needs: buildWithWindows
if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'WSAPlayer'))
outputs:
buildVersion: ${{ steps.build.outputs.buildVersion }}
steps:
- name: Checkout Repository
uses: actions/checkout@v3
Expand All @@ -563,9 +563,14 @@ jobs:
git lfs pull
git add .
git reset --hard
- name: Cache Library
uses: actions/cache@v3
with:
path: Library
key: Library-WSAPlayer-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
restore-keys: Library-WSAPlayer
- name: Build Unity Project
id: build
continue-on-error: true
timeout-minutes: 45
uses: game-ci/unity-builder@main
env:
Expand All @@ -580,15 +585,24 @@ jobs:
with:
name: cgs-WSAPlayer
path: build/WSAPlayer

deployToMicrosoftStore:
name: Deploy to the Microsoft Store
runs-on: windows-2022
needs: buildWSAPlayer
if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'WSAPlayer'))
steps:
- name: Download WSAPlayer Artifact
uses: actions/download-artifact@v3
with:
name: cgs-WSAPlayer
path: build/WSAPlayer
- name: Checkout Card-Game-Simulator
run: |
mkdir C:/Card-Game-Simulator.git
git clone https://github.com/finol-digital/Card-Game-Simulator.git C:/Card-Game-Simulator.git --depth=1
mkdir C:/Card-Game-Simulator.git/build
mv build/WSAPlayer C:/Card-Game-Simulator.git/build
ls C:/Card-Game-Simulator.git/build
ls C:/Card-Game-Simulator.git/build/WSAPlayer
ls C:/Card-Game-Simulator.git/build/WSAPlayer/WSAPlayer
- name: Update Release Notes
working-directory: C:/Card-Game-Simulator.git
if: github.event.action == 'published'
Expand Down Expand Up @@ -630,6 +644,17 @@ jobs:
with:
files: "C:/Card-Game-Simulator.git/build/WSAPlayer/WSAPlayer/Card Game Simulator/Card Game Simulator.vcxproj"
replacements: "</PropertyGroup>=<ProjectName>CardGameSimulator</ProjectName></PropertyGroup>"
- name: Fix Unity Editor Path
working-directory: C:/Card-Game-Simulator.git
shell: pwsh
env:
UwpProjectDirectory: build\WSAPlayer\WSAPlayer
run: |
[xml]$manifest = get-content ".\$env:UwpProjectDirectory\UnityCommon.props"
$manifest.Project.PropertyGroup.UnityWSAPlayerDir = "C:\Program Files\Unity\Hub\Editor\2021.3.16f1\Editor\Data\PlaybackEngines\MetroSupport\"
$manifest.save(".\$env:UwpProjectDirectory\UnityCommon.props")
echo ".\$env:UwpProjectDirectory\UnityCommon.props"
cat ".\$env:UwpProjectDirectory\UnityCommon.props"
- name: Add Package.StoreAssociation.xml to .vcxproj
uses: mingjun97/file-regex-replace@v1
with:
Expand Down Expand Up @@ -714,8 +739,8 @@ jobs:
- name: Upload .appxupload
uses: actions/upload-artifact@v3
with:
name: ${{ format('CardGameSimulator_{0}.0_x86_x64_arm_arm64_bundle_Master.appxupload', steps.build.outputs.buildVersion) }}
path: ${{ format('{0}\build\WSAPlayer\WSAPlayer\AppPackages\CardGameSimulator\CardGameSimulator_{1}.0_x86_x64_arm_arm64_bundle_Master.appxupload', 'C:\Card-Game-Simulator.git', steps.build.outputs.buildVersion) }}
name: ${{ format('CardGameSimulator_{0}.0_x86_x64_arm_arm64_bundle_Master.appxupload', needs.buildWSAPlayer.outputs.buildVersion) }}
path: ${{ format('{0}\build\WSAPlayer\WSAPlayer\AppPackages\CardGameSimulator\CardGameSimulator_{1}.0_x86_x64_arm_arm64_bundle_Master.appxupload', 'C:\Card-Game-Simulator.git', needs.buildWSAPlayer.outputs.buildVersion) }}
- name: Upload to the Microsoft Store
working-directory: C:/Card-Game-Simulator.git
shell: pwsh
Expand All @@ -727,7 +752,7 @@ jobs:
STOREBROKER_CONFIG_PATH: ${{ format('{0}\storebroker\SBConfig.json', 'C:\Card-Game-Simulator.git') }}
PDP_ROOT_PATH: ${{ format('{0}\storebroker\', 'C:\Card-Game-Simulator.git') }}
IMAGES_ROOT_PATH: ${{ format('{0}\docs\assets\img\', 'C:\Card-Game-Simulator.git') }}
APPX_PATH: ${{ format('{0}\build\WSAPlayer\WSAPlayer\AppPackages\CardGameSimulator\CardGameSimulator_{1}.0_x86_x64_arm_arm64_bundle_Master.appxupload', 'C:\Card-Game-Simulator.git', steps.build.outputs.buildVersion) }}
APPX_PATH: ${{ format('{0}\build\WSAPlayer\WSAPlayer\AppPackages\CardGameSimulator\CardGameSimulator_{1}.0_x86_x64_arm_arm64_bundle_Master.appxupload', 'C:\Card-Game-Simulator.git', needs.buildWSAPlayer.outputs.buildVersion) }}
OUT_PATH: ${{ format('{0}\build\WSAPlayer\WSAPlayer\', 'C:\Card-Game-Simulator.git') }}
SUBMISSION_DATA_PATH: ${{ format('{0}\build\WSAPlayer\WSAPlayer\upload.json', 'C:\Card-Game-Simulator.git') }}
PACKAGE_PATH: ${{ format('{0}\build\WSAPlayer\WSAPlayer\upload.zip', 'C:\Card-Game-Simulator.git') }}
Expand Down
52 changes: 39 additions & 13 deletions Assets/Prefabs/CardGameView/Viewer/Stack Viewer.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/pages/roadmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ permalink: roadmap.html

# Roadmap

## What's New - v1.96
- Game-Play: Drop Stack on top of Cards or other Stacks
## What's New - v1.97
Minor Bug Fixes

## Active Sprint
- Game-Play: Special action buttons (i.e. button to reset rotation for all cards, button to turn all cards faceup, etc.)
Expand Down

0 comments on commit d20b7c3

Please sign in to comment.