Merge pull request #2 from Keyfactor/ci_fixes

Ci fixes

Author: spbsoluble

.github/workflows/sync-nuget.yml

@@ -25,10 +25,29 @@ jobs:
         with:
           dotnet-version: '8.0.x'
 
-      - name: Install NuGet CLI
-        uses: nuget/[email protected]
-        with:
-          nuget-version: '5.x'
+      # Install Mono (runtime for .exe files)
+      - name: Install Mono
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y mono-complete
+
+      # Download nuget.exe if you don't already have it
+      - name: Download nuget.exe
+        run: |
+          mkdir -p $HOME/.nuget
+          curl -L https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -o $HOME/.nuget/nuget.exe
+
+      # Create a shim so 'nuget' works just like on macOS
+      - name: Create nuget shim
+        run: |
+          echo '#!/usr/bin/env bash' > /usr/local/bin/nuget
+          echo "mono $HOME/.nuget/nuget.exe \"\$@\"" >> /usr/local/bin/nuget
+          chmod +x /usr/local/bin/nuget
+
+#      - name: Install NuGet CLI
+#        uses: nuget/[email protected]
+#        with:
+#          nuget-version: '5.x'
 
       - name: Install Python dependencies
         run: |
@@ -41,15 +60,23 @@ jobs:
           echo '<?xml version="1.0" encoding="utf-8"?>' > ~/.nuget/NuGet/NuGet.Config
           echo '<configuration>' >> ~/.nuget/NuGet/NuGet.Config
           echo '  <packageSources>' >> ~/.nuget/NuGet/NuGet.Config
-          echo '    <add key="Azure DevOps" value="https://pkgs.dev.azure.com/Keyfactor/_packaging/KeyfactorPackages/nuget/v3/index.json" />' >> ~/.nuget/NuGet/NuGet.Config
+          echo '    <add key="keyfactor" value="https://pkgs.dev.azure.com/Keyfactor/_packaging/KeyfactorPackages/nuget/v3/index.json" />' >> ~/.nuget/NuGet/NuGet.Config
+          echo '    <add key="github" value="https://nuget.pkg.github.com/Keyfactor/index.json" />' >> ~/.nuget/NuGet/NuGet.Config
           echo '  </packageSources>' >> ~/.nuget/NuGet/NuGet.Config
           echo '  <packageSourceCredentials>' >> ~/.nuget/NuGet/NuGet.Config
-          echo '    <Azure_x0020_DevOps>' >> ~/.nuget/NuGet/NuGet.Config
-          echo '      <add key="Username" value="user" />' >> ~/.nuget/NuGet/NuGet.Config
+          echo '    <github>' >> ~/.nuget/NuGet/NuGet.Config
+          echo '      <add key="Username" value="spbsoluble" />' >> ~/.nuget/NuGet/NuGet.Config
+          echo '      <add key="ClearTextPassword" value="${{ secrets.GH_NUGET_TOKEN }}" />' >> ~/.nuget/NuGet/NuGet.Config
+          echo '    </github>' >> ~/.nuget/NuGet/NuGet.Config
+          echo '    <keyfactor>' >> ~/.nuget/NuGet/NuGet.Config
+          echo '      <add key="Username" value="AzureDevOps" />' >> ~/.nuget/NuGet/NuGet.Config
           echo '      <add key="ClearTextPassword" value="${{ secrets.AZ_DEVOPS_PAT }}" />' >> ~/.nuget/NuGet/NuGet.Config
-          echo '    </Azure_x0020_DevOps>' >> ~/.nuget/NuGet/NuGet.Config
+          echo '    </keyfactor>' >> ~/.nuget/NuGet/NuGet.Config
           echo '  </packageSourceCredentials>' >> ~/.nuget/NuGet/NuGet.Config
           echo '</configuration>' >> ~/.nuget/NuGet/NuGet.Config
+          cat ~/.nuget/NuGet/NuGet.Config
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_NUGET_TOKEN }}
 
       - name: Run NuGet sync script
         run: python scripts/sync_nuget.py

README.md

@@ -8,11 +8,27 @@ Studio or other development tools.
 Some package availability changes from time to time. Please view the `CHANGELOG.md` for further details on changes to
 available libraries.
 
-## Adding a package source
+## Adding a Nuget Package and/or Version
 
-In order to add a nuget package to the keyfactor GPR, you must download from the DevOps Artifacts site and then push it
-to the GitHub Package Registry (GPR) using a Personal Access Token (PAT).
+### Via GitHub Actions
 
+To add a Nuget package modify the [packages.yml](./packages.yml) file in the root of this repository.
+
+> [!IMPORTANT]
+> The package and version must exist in this Nuget repository before it can be added to the `packages.yml` file.
+> https://dev.azure.com/Keyfactor/Engineering/_artifacts/feed/KeyfactorPackages@Local
+
+The to trigger the sync run the
+workflow [Sync NuGet Packages](https://github.com/Keyfactor/public-nuget-packages/actions/workflows/sync-nuget.yml). Once
+it's complete, the package will be available in the Keyfactor Public GitHub Package Registry (GPR).
+
+### Manually using dotnet CLI
+
+In order to add a nuget package to the Keyfactor Public GitHub Package Registry (GPR), you must download from the 
+[DevOps Artifacts site](https://dev.azure.com/Keyfactor/Engineering/_artifacts/feed/KeyfactorPackages@Local) 
+and then push it to the GPR using a Personal Access Token (PAT).
+
+Steps:
 1. Create a new PAT with access with `write:packages` access
 2. Grant SSO to the PAT
 3. Run the following command to push the package to the GitHub Package Registry (GPR):