Skip to content

Commit 4e62247

Browse files
authored
fix: fixing ci things (#377)
1 parent 5666540 commit 4e62247

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

.github/workflows/publish.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
paths:
88
- "zarf.yaml"
99
- "zarf-config.yaml"
10+
workflow_dispatch:
11+
12+
env:
13+
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/defenseunicorns/zarf/zarf-agent
14+
ZARF_VERSION: v0.51.0
1015

1116
jobs:
1217
release:
@@ -17,7 +22,7 @@ jobs:
1722
strategy:
1823
matrix:
1924
flavor:
20-
- registry1
25+
- ""
2126
- gitea-registry1
2227
steps:
2328
- uses: actions/checkout@v4
@@ -36,8 +41,13 @@ jobs:
3641
- name: Install Zarf
3742
uses: defenseunicorns/setup-zarf@main
3843
with:
39-
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/defenseunicorns/zarf/zarf-agent
40-
version: v0.51.0
44+
version: ${{ env.ZARF_VERSION }}
4145
download-init-package: false
4246
- name: Build and Publish IB Package
43-
run: zarf package create --confirm --output oci://ghcr.io/defenseunicorns/delivery-zarf-init --no-progress --flavor ${{ matrix.flavor }}
47+
run: |
48+
zarf package create --confirm --output oci://ghcr.io/defenseunicorns/delivery-zarf-init --no-progress --flavor ${{ matrix.flavor }}
49+
50+
# retag base package as registry1
51+
if [[ "${{ matrix.flavor }}" == "" ]]; then
52+
zarf tools registry copy ghcr.io/defenseunicorns/delivery-zarf-init/init:${ZARF_VERSION} ghcr.io/defenseunicorns/delivery-zarf-init/init:${ZARF_VERSION}-registry1
53+
fi

.github/workflows/update-zarf-injector.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Zarf Injector Update
22

33
on:
44
pull_request:
5-
paths:
6-
- "zarf.yaml"
7-
- "zarf-config.yaml"
85
branches:
96
- "main"
107
workflow_dispatch:

renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*version: (?<currentValue>.*)\\s",
4949
'datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?gitea_image: "[^"]+:(?<currentValue>[^"]+)"\\s',
5050
"datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?init:(?<currentValue>[^\\s]+)\\s",
51+
"datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*ZARF_VERSION: (?<currentValue>.*)\\s",
5152
],
5253
versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
5354
},

0 commit comments

Comments
 (0)