Merge branch 'main' into renovate/serde_json-1.x

zarf-dev · Jan 6, 2023 · 9120031 · 9120031
2 parents 538a889 + 1cdb324
commit 9120031
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/gitea/zarf.yaml b/packages/gitea/zarf.yaml
@@ -31,7 +31,7 @@ components:
   - name: git-server
     description: "Add Gitea for serving gitops-based clusters in an airgap"
     images:
-      - gitea/gitea:1.17.3
+      - gitea/gitea:1.17.4
     manifests:
       - name: git-connect
         namespace: zarf
@@ -41,7 +41,7 @@ components:
       - name: gitea
         releaseName: zarf-gitea
         url: https://dl.gitea.io/charts
-        version: 6.0.3
+        version: 6.0.5
         namespace: zarf
         valuesFiles:
           - gitea-values.yaml

diff --git a/src/test/e2e/06_create_sbom_test.go b/src/test/e2e/06_create_sbom_test.go
@@ -50,9 +50,9 @@ func TestCreateSBOM(t *testing.T) {
 	_, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-defenseunicorns_zarf-game_multi-tile-dark.html"))
 	require.NoError(t, err)
 	// Test that the init package generates the SBOMs we expect (images + component files)
-	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-gitea_gitea_1.17.3.html"))
+	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-gitea_gitea_1.17.4.html"))
 	require.NoError(t, err)
-	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "gitea_gitea_1.17.3.json"))
+	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "gitea_gitea_1.17.4.json"))
 	require.NoError(t, err)
 	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-zarf-component-k3s.html"))
 	require.NoError(t, err)