Update workflows

sungaila · Sep 1, 2023 · 9897d32 · 9897d32
1 parent 4be5018
commit 9897d32
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/.github/workflows/githubpages.yml b/.github/workflows/githubpages.yml
@@ -34,6 +34,36 @@ jobs:
         run: sed -i 's/<base href="\/" \/>/<base href="\/${{github.event.repository.name}}\/" \/>/g' src/WebConverter/bin/Release/net7.0/publish/wwwroot/index.html
       - name: Create .nojekyll file
         run: touch src/WebConverter/bin/Release/net7.0/publish/wwwroot/.nojekyll
+      - name: Update service-worker-assets.js hashes
+        working-directory: src/WebConverter/bin/Release/net7.0/publish/wwwroot
+        run: |
+          jsFile=$(<service-worker-assets.js)
+          # remove JavaScript from contents so it can be interpreted as JSON
+          json=$(echo "$jsFile" | sed "s/self.assetsManifest = //g" | sed "s/;//g")
+          # grab the assets JSON array
+          assets=$(echo "$json" | jq '.assets[]' -c)
+          for asset in $assets
+          do
+            oldHash=$(echo "$asset" | jq '.hash')
+            #remove leading and trailing quotes
+            oldHash="${oldHash:1:-1}"
+            path=$(echo "$asset" | jq '.url')
+            #remove leading and trailing quotes
+            path="${path:1:-1}"
+            newHash="sha256-$(openssl dgst -sha256 -binary $path | openssl base64 -A)"
+          
+            if [ $oldHash != $newHash ]; then
+              # escape slashes for json
+              oldHash=$(echo "$oldHash" | sed 's;/;\\/;g')
+              newHash=$(echo "$newHash" | sed 's;/;\\/;g')
+              echo "Updating hash for $path from $oldHash to $newHash"
+              # escape slashes second time for sed
+              oldHash=$(echo "$oldHash" | sed 's;/;\\/;g')
+              jsFile=$(echo -n "$jsFile" | sed "s;$oldHash;$newHash;g")
+            fi
+          done
+
+          echo -n "$jsFile" > service-worker-assets.js
       - name: Upload pages artifact
         uses: actions/upload-pages-artifact@main
         with:

diff --git a/src/WebConverter/Shared/NavMenu.razor b/src/WebConverter/Shared/NavMenu.razor
@@ -26,9 +26,12 @@
 		<div class="nav-item px-3">
 			<NavLink class="nav-link" href="@ReleaseUrl" target="_blank">@SemanticVersion</NavLink>
 		</div>
-		<div class="nav-item px-3">
-			<NavLink class="nav-link" href="@CommitUrl" title="@CommitId" target="_blank">@CommitIdShort</NavLink>
-		</div>
+		@if (!string.IsNullOrEmpty(CommitId))
+		{
+			<div class="nav-item px-3">
+				<NavLink class="nav-link" href="@CommitUrl" title="@CommitId" target="_blank">@CommitIdShort</NavLink>
+			</div>
+		}
 	</nav>
 </div>
 
@@ -47,7 +50,7 @@
 	private static string? ProductVersion { get; set; }
 	private static string? SemanticVersion => $"v{ProductVersion?.Split('+', StringSplitOptions.RemoveEmptyEntries)?.First()}";
 	private static string? ReleaseUrl => SemanticVersion != null ? $"{GitHubUrl}/releases/tag/{SemanticVersion}" : GitHubUrl;
-	private static string? CommitId => ProductVersion?.Split('+', StringSplitOptions.RemoveEmptyEntries)?.Last();
+	private static string? CommitId => ProductVersion != null && ProductVersion.Contains('+') ? ProductVersion?.Split('+', StringSplitOptions.RemoveEmptyEntries)?.Last() : null;
 	private static string? CommitIdShort => CommitId?.Substring(0, Math.Min(7, CommitId.Length));
 	private static string CommitUrl => CommitId != null ? $"{GitHubUrl}/commit/{CommitId}" : GitHubUrl;
 

diff --git a/src/WebConverter/WebConverter.csproj b/src/WebConverter/WebConverter.csproj
@@ -40,6 +40,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" />
     <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.5" />
     <PackageReference Include="Thinktecture.Blazor.FileHandling" Version="2.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>