Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/track unity sdk version 2 #212

Closed
wants to merge 7 commits into from
Closed

Feat/track unity sdk version 2 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a07700
feat: add sdk version info helper
CodeSchwert Jun 6, 2024
d088a09
feat: add version string replace into update-version workflow
CodeSchwert Jun 6, 2024
9057273
fix: workflow ci errors
CodeSchwert Jun 6, 2024
53fc89a
ci: fix tag yml
nattb8 Jun 6, 2024
6386ea3
ci: fix tag yml 2
nattb8 Jun 6, 2024
bcadeed
ci: disable shell linting
nattb8 Jun 6, 2024
bcc1564
ci: test
nattb8 Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ jobs:
VALIDATE_MARKDOWN: false
VALIDATE_GITLEAKS: false
VALIDATE_JSCPD: false
VALIDATE_SHELL_SHFMT: false
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: extract_version
run: |
VERSION=$(jq -r .version ./src/Packages/Passport/package.json)
echo "VERSION=$VERSION" >> $GITHUB_ENV
echo "VERSION=$VERSION" >> "$GITHUB_ENV"

- name: Create Tag
uses: negz/create-tag@v1
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/update-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@ jobs:
run: |
FILE=./src/Packages/Passport/package.json
VERSION=${{ github.event.inputs.version }}
jq --arg version "$VERSION" '.version = $version' "./src/Packages/Passport/package.json" > tmp.$$.json && mv tmp.$$.json "./src/Packages/Passport/package.json"
jq --arg version "$VERSION" '.version = $version' $FILE > tmp.$$.json && mv tmp.$$.json $FILE

- name: Replace engine sdk version string
id: replace_engine_sdk_version
run: |
FILE=./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs
VERSION=${{ github.event.inputs.version }}
sed -i "s/__ENGINE_SDK_VERSION__/$VERSION/g" $FILE

- uses: gr2m/create-or-update-pull-request-action@v1
env:
Expand Down
10 changes: 10 additions & 0 deletions src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Immutable.Passport.Helpers
{
public class SdkVersionInfoHelpers
{
public static string GetSdkVersionInfo()
{
return "__ENGINE_SDK_VERSION__";
}
}
}
11 changes: 11 additions & 0 deletions src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs.meta
View file
Open in desktop

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

1 change: 1 addition & 0 deletions src/Packages/Passport/Runtime/Scripts/Private/Model/Request/VersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public class VersionInfo
{
public string engine;
public string engineVersion;
public string engineSdkVersion;
public string platform;
public string platformVersion;
public string deviceModel;
Expand Down
1 change: 1 addition & 0 deletions src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public async UniTask Init(string clientId, string environment, string redirectUr
{
engine = "unity",
engineVersion = Application.unityVersion,
engineSdkVersion = SdkVersionInfoHelpers.GetSdkVersionInfo(),
platform = Application.platform.ToString(),
platformVersion = SystemInfo.operatingSystem,
deviceModel = SystemInfo.deviceModel
Expand Down
Loading