Skip to content

Update artifact upload workflow #253

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

Merged
ivandrofly merged 5 commits into from
Nov 22, 2024
Merged

Update artifact upload workflow #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75db412
Update workflow to use filtered solution file
ivandrofly Nov 22, 2024
4c859a0
Remove unused configuration entries from Plugins.sln
ivandrofly Nov 22, 2024
5435fe3
Remove redundant PropertyGroup elements
ivandrofly Nov 22, 2024
e1b138c
Reorganize using directives in Main.cs
ivandrofly Nov 22, 2024
fa1fb85
Improve XML formatting for Plugin-Shared.shproj file
ivandrofly Nov 22, 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
53 changes: 35 additions & 18 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ on:
push:
branches:
- main
- github-actions
pull_request:
branches:
- main

jobs:
build:
build-job:
runs-on: windows-latest
# strategy:
# matrix:
# plugin: [ 'NoRecursiveDash', 'HIColorer', 'HI2UC', 'LinesUnbreaker' ]

steps:
# Checkout the repository
Expand Down Expand Up @@ -41,21 +39,40 @@ jobs:

# Build the solution
- name: Build solution
run: msbuild "source\Plugins.Filter.slnf" /p:Configuration=Release /p:SkipSharedProject=true
run: msbuild "source\Plugins.Filter.slnf" /p:Configuration=Release

# Copy dll to target directory
- name: Create archives
shell: pwsh
run: source\zip-plugin-files.ps1

# - name: Upload Artifact (All)
# uses: actions/upload-artifact@v4
# with:
# name: Plugins
# path: C:\plugins\*.dll
call-upload-artifacts-workflow:
- use: ./github/workflows/upload-artifacts.yml
# - name: Upload Artifact
# uses: actions/upload-artifact@v4
# with:
# name: ${{matrix.plugin}}
# path: C:\plugins\${{matrix.plugin}}.dll

# Upload plugins/artifacts
- name: Upload HI2UC
uses: actions/upload-artifact@v4
with:
name: HI2UC
path: C:\plugins\HI2UC.dll

- name: Upload HIColorer
uses: actions/upload-artifact@v4
with:
name: HIColorer
path: C:\plugins\HIColorer.dll

- name: Upload TightHyphen
uses: actions/upload-artifact@v4
with:
name: TightHyphen
path: C:\plugins\TightHyphen.dll

- name: Upload NoRecursiveDash
uses: actions/upload-artifact@v4
with:
name: NoRecursiveDash
path: C:\plugins\NoRecursiveDash.dll

- name: Upload LinesUnbreaker
uses: actions/upload-artifact@v4
with:
name: LinesUnbreaker
path: C:\plugins\LinesUnbreaker.dll
18 changes: 0 additions & 18 deletions .github/workflows/upload-artifacts.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions source/DictionariesProvider/Forms/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Newtonsoft.Json;
using Nikse.SubtitleEdit.PluginLogic.Helpers;
using Nikse.SubtitleEdit.PluginLogic.Helpers;
using Nikse.SubtitleEdit.PluginLogic.Models;
using System;
using System.Collections.Generic;
Expand All @@ -9,6 +8,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
using Newtonsoft.Json;

namespace Nikse.SubtitleEdit.PluginLogic.Forms
{
Expand Down
19 changes: 9 additions & 10 deletions source/Plugin-Shared/Plugin-Shared.shproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>59aa41aa-6c3e-456f-8ec1-3c0c90e31811</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="Plugin-Shared.projitems" Label="Shared" Condition="'$(SkipSharedProject)' != 'true'"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
<PropertyGroup Label="Globals">
<ProjectGuid>59aa41aa-6c3e-456f-8ec1-3c0c90e31811</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
<Import Project="Plugin-Shared.projitems" Label="Shared"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
</Project>
Loading
Loading