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

update GitHub action to use newer versions #625

Merged
merged 1 commit into from
Mar 3, 2024
Merged

update GitHub action to use newer versions #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/actions/checkout/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runs:
- name: Get changed files in the .github folder
if: github.event_name == 'pull_request_target'
id: changedWorkflowFiles
uses: tj-actions/changed-files@v35
uses: tj-actions/changed-files@v42
with:
files: |
.github/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/activation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: game-ci/unity-request-activation-file@v2
# Upload artifact (Unity_v20XX.X.XXXX.alf)
- name: Expose as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ steps.getManualLicenseFile.outputs.filePath }}
path: ${{ steps.getManualLicenseFile.outputs.filePath }}
46 changes: 26 additions & 20 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ jobs:

steps:
- name: Checkout action file
uses: Bhacaz/checkout-files@v2
uses: actions/checkout@v4
with:
files: .github/actions/checkout/action.yml
sparse-checkout: .github/actions/checkout/action.yml
sparse-checkout-cone-mode: false

- name: Checkout
uses: ./.github/actions/checkout
Expand Down Expand Up @@ -56,9 +57,10 @@ jobs:

steps:
- name: Checkout action file
uses: Bhacaz/checkout-files@v2
uses: actions/checkout@v4
with:
files: .github/actions/checkout/action.yml
sparse-checkout: .github/actions/checkout/action.yml
sparse-checkout-cone-mode: false

- name: Checkout
uses: ./.github/actions/checkout
Expand All @@ -69,7 +71,7 @@ jobs:
version: ${{ needs.determineVersionNumber.outputs.version }}

- name: Upload NuGetForUnity dlls
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: NuGetForUnity-dlls
path: |
Expand All @@ -81,15 +83,15 @@ jobs:
- name: Check if files in NuGetForUnity.PluginAPI changed
if: github.event_name == 'pull_request_target'
id: changedPluginApiCode
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
files: |
src/NuGetForUnity.PluginAPI/**.cs

- name: Check if NuGetForUnity.PluginAPI.dll is updated
if: github.event_name == 'pull_request_target'
id: changedPluginApiDll
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
files: |
src/NuGetForUnity/Editor/PluginAPI/NuGetForUnity.PluginAPI.dll
Expand All @@ -112,15 +114,16 @@ jobs:

steps:
- name: Checkout action file
uses: Bhacaz/checkout-files@v2
uses: actions/checkout@v4
with:
files: .github/actions/checkout/action.yml
sparse-checkout: .github/actions/checkout/action.yml
sparse-checkout-cone-mode: false

- name: Checkout
uses: ./.github/actions/checkout

- name: Download NuGetForUnity dlls
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: NuGetForUnity-dlls
path: ./src/NuGetForUnity.Packager/Assets/NuGet/Editor
Expand All @@ -145,7 +148,7 @@ jobs:
version: ${{ needs.determineVersionNumber.outputs.version }}

- name: Upload UnityPackage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: NuGetForUnity.${{ needs.determineVersionNumber.outputs.version }}.unitypackage
path: ./src/NuGetForUnity.Packager/NugetForUnity.unitypackage
Expand All @@ -158,15 +161,16 @@ jobs:

steps:
- name: Checkout action file
uses: Bhacaz/checkout-files@v2
uses: actions/checkout@v4
with:
files: .github/actions/checkout/action.yml
sparse-checkout: .github/actions/checkout/action.yml
sparse-checkout-cone-mode: false

- name: Checkout
uses: ./.github/actions/checkout

- name: Setup dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"

Expand Down Expand Up @@ -195,7 +199,7 @@ jobs:
--source https://api.nuget.org/v3/index.json

- name: Upload NuGet packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: NuGetForUnity-NuGetPackages
path: |
Expand All @@ -208,9 +212,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout action file
uses: Bhacaz/checkout-files@v2
uses: actions/checkout@v4
with:
files: .github/actions/checkout/action.yml
sparse-checkout: .github/actions/checkout/action.yml
sparse-checkout-cone-mode: false

- name: Checkout
uses: ./.github/actions/checkout
Expand Down Expand Up @@ -239,15 +244,16 @@ jobs:

steps:
- name: Checkout action file
uses: Bhacaz/checkout-files@v2
uses: actions/checkout@v4
with:
files: .github/actions/checkout/action.yml
sparse-checkout: .github/actions/checkout/action.yml
sparse-checkout-cone-mode: false

- name: Checkout
uses: ./.github/actions/checkout

- name: Download NuGetForUnity.Cli NuGet package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: NuGetForUnity-NuGetPackages
path: .
Expand Down
22 changes: 16 additions & 6 deletions src/NuGetForUnity.Tests/Assets/Tests/Editor/NuGetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ public void InstallRoslynAnalyzerTest([Values] InstallMode installMode)
var meta = (PluginImporter)AssetImporter.GetAtPath(path);

#if UNITY_2022_3_OR_NEWER

// somehow unity doesn't import the .dll on newer unity version
var postprocessor = new NugetAssetPostprocessor() { assetPath = path };
var postprocessor = new NugetAssetPostprocessor { assetPath = path };
postprocessor.GetType().GetMethod("OnPreprocessAsset", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(postprocessor, null);
#endif

Expand Down Expand Up @@ -162,14 +163,16 @@ public void InstallRoslynAnalyzerWithMultipleVersionsTest(string unityVersion, s

foreach (var roslynAnalyzerVersion in roslynAnalyzerVersions)
{
var path = $"Assets/Packages/{jsonPackageId.Id}.{jsonPackageId.Version}/analyzers/dotnet/roslyn{roslynAnalyzerVersion}/cs/System.Text.Json.SourceGeneration.dll";
var path =
$"Assets/Packages/{jsonPackageId.Id}.{jsonPackageId.Version}/analyzers/dotnet/roslyn{roslynAnalyzerVersion}/cs/System.Text.Json.SourceGeneration.dll";
Assert.That(path, Does.Exist.IgnoreDirectories);
var meta = (PluginImporter)AssetImporter.GetAtPath(path);
meta.SaveAndReimport();

#if UNITY_2022_3_OR_NEWER

// somehow unity doesn't import the .dll on newer unity version
var postprocessor = new NugetAssetPostprocessor() { assetPath = path };
var postprocessor = new NugetAssetPostprocessor { assetPath = path };
postprocessor.GetType().GetMethod("OnPreprocessAsset", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(postprocessor, null);
#endif
}
Expand All @@ -178,7 +181,8 @@ public void InstallRoslynAnalyzerWithMultipleVersionsTest(string unityVersion, s

foreach (var roslynAnalyzerVersion in roslynAnalyzerVersions)
{
var path = $"Assets/Packages/{jsonPackageId.Id}.{jsonPackageId.Version}/analyzers/dotnet/roslyn{roslynAnalyzerVersion}/cs/System.Text.Json.SourceGeneration.dll";
var path =
$"Assets/Packages/{jsonPackageId.Id}.{jsonPackageId.Version}/analyzers/dotnet/roslyn{roslynAnalyzerVersion}/cs/System.Text.Json.SourceGeneration.dll";
Assert.That(path, Does.Exist.IgnoreDirectories);
var meta = (PluginImporter)AssetImporter.GetAtPath(path);
Assert.IsNotNull(meta, "Get meta file");
Expand All @@ -187,11 +191,17 @@ public void InstallRoslynAnalyzerWithMultipleVersionsTest(string unityVersion, s
Assert.IsFalse(meta.GetCompatibleWithEditor(), "Expected to have set compatible with editor to false");
if (roslynAnalyzerVersion == expectedEnabledRoslynAnalyzerVersion)
{
Assert.That(AssetDatabase.GetLabels(meta), Does.Contain("RoslynAnalyzer"), $"DLL of Roslyn analyzer version '{roslynAnalyzerVersion}' should have 'RoslynAnalyzer' label");
Assert.That(
AssetDatabase.GetLabels(meta),
Does.Contain("RoslynAnalyzer"),
$"DLL of Roslyn analyzer version '{roslynAnalyzerVersion}' should have 'RoslynAnalyzer' label");
}
else
{
Assert.That(AssetDatabase.GetLabels(meta), Does.Not.Contain("RoslynAnalyzer"), $"DLL of Roslyn analyzer version '{roslynAnalyzerVersion}' should not have 'RoslynAnalyzer' label");
Assert.That(
AssetDatabase.GetLabels(meta),
Does.Not.Contain("RoslynAnalyzer"),
$"DLL of Roslyn analyzer version '{roslynAnalyzerVersion}' should not have 'RoslynAnalyzer' label");
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/NuGetForUnity/Editor/NugetAssetPostprocessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ private static void ModifyImportSettingsOfRoslynAnalyzer([NotNull] PluginImporte
else
{
var versionPrefixIndex = assetPath.IndexOf(AnalyzersRoslynVersionsFolderName, StringComparison.Ordinal);
var analyzerVersionsRootDirectoryPath = Path.Combine(assetPath.Substring(0, versionPrefixIndex), AnalyzersRoslynVersionsFolderName);
var analyzerVersionsRootDirectoryPath = Path.Combine(
assetPath.Substring(0, versionPrefixIndex),
AnalyzersRoslynVersionsFolderName);
var analyzersFolders = Directory.EnumerateDirectories(analyzerVersionsRootDirectoryPath);
var allEnabledRoslynVersions = analyzersFolders.Select(GetRoslynVersionNumberFromAnalyzerPath)
.Where(version => version != null && version.CompareTo(maxSupportedRoslynVersion) <= 0)
Expand Down
Loading