Update actions

ThisNetWorks · Aug 29, 2021 · 454698f · 454698f
1 parent 5a1e712
commit 454698f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,27 +1,26 @@
-name: Build
+name: build
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
     paths-ignore:
-    - 'docs/**'
-    - 'readme.md'
+      - "docs/**"
+      - "readme.md"
 
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-    - name: Test
-      run: dotnet test --no-restore
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+      - name: Install dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+      - name: Test
+        run: dotnet test --no-restore --no-build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,29 +2,34 @@ name: publish
 
 on:
   push:
-    branches: [ release/1.x ]
+    tags:
+      - v*
 
 jobs:
-  build:
-
+  publish:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-    - name: Install dependencies
-      run: dotnet restore 
-    - name: Build
-      run: dotnet build --configuration Release --no-restore 
-    - name: Test
-      run: dotnet test --no-restore
-    - name: Pack with dotnet
-      run: dotnet pack --output artifacts --configuration Release
-    - name: Push with dotnet
-      run: dotnet nuget push artifacts/*.nupkg --api-key ${{ secrets.API_KEY }} --source https://api.nuget.org/v3/index.json                  
-    - name: Archive artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: artifacts
-        path: artifacts
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+      - name: Install dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+      - name: Test
+        run: dotnet test --no-restore --no-build
+      - name: Pack
+        run: |
+          arrTag=(${GITHUB_REF//\// })
+          VERSION="${arrTag[2]}"
+          VERSION="${VERSION:1}"
+          echo "VERSION $VERSION"
+          dotnet pack --output artifacts --configuration Release --no-restore --no-build -p:Version=$VERSION -p:TreatWarningsAsErrors=false
+      - name: Push with dotnet
+        run: dotnet nuget push artifacts/*.nupkg --api-key ${{ secrets.API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: artifacts
+          path: artifacts
diff --git a/Common.props b/Common.props
@@ -5,7 +5,8 @@
     <Authors>Dean Marcussen</Authors>
     <PackageProjectUrl>https://github.com/ThisNetWorks/ThisNetWorks.OrchardCore.CKEditor</PackageProjectUrl>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(GITHUB_RUN_ID)' != ''">$(VersionSuffix)-$(GITHUB_RUN_ID)</VersionSuffix>
+    <VersionSuffix>preview</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <LangVersion>Latest</LangVersion>

diff --git a/README.md b/README.md
@@ -36,10 +36,14 @@ For further customization of builds, alternate editors, etc, please refer to the
 
 ## Versions
 
-Currently built against 
+Version tags and pre release suffixes are based of the version of Orchard Core referenced.
 
-- Orchard Core Version `1.0.0-rc2-15621`
-- CKEditor Classic Build Version `23.0.0`
+For version 1.0 of Orchard Core use `1.0.0`, which will use the [Orchard Core NuGet Feed](https://www.nuget.org/packages/OrchardCore/).
+
+Prerelease versions are suffixed with the CloudSmith build of Orchard Core referenced, 
+and will required a configured CloudSmith NuGet feed. Refer [Configuring a preview package source](https://docs.orchardcore.net/en/latest/docs/getting-started/preview-package-source/)
+
+e.g. `1.1.0-preview-16439` refers to the CloudSmith Orchard Core prerelease build `v1.1.0-preview-16439`
 
 ## License
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageTags>ckeditor;ckeditor5;orchardcore;</PackageTags>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta</VersionSuffix>
+    <VersionSuffix>preview</VersionSuffix>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

diff --git a/src/ThisNetWorks.OrchardCore.CKEditor/Manifest.cs b/src/ThisNetWorks.OrchardCore.CKEditor/Manifest.cs
@@ -4,8 +4,12 @@
     Name = "ThisNetWorks OrchardCore CKEditor",
     Author = "ThisNetWorks",
     Website = "https://github.com/thisnetworks",
-    Version = "0.0.1",
+    Version = "1.0.0",
     Description = "ThisNetWorks CKEditor editors and media plugins",
-    Dependencies = new[] { "OrchardCore.ContentFields", "OrchardCore.Html" },
+    Dependencies = new[] 
+    { 
+        "OrchardCore.ContentFields", 
+        "OrchardCore.Html"
+    },
     Category = "Content Management"
 )]