Skip to content

Commit

Permalink
chore: renovate fixes (#47)
Browse files Browse the repository at this point in the history
* renovate fixes

* revert unnessary deletion of integration tests

* renovate updates

* update uds common version

* update core and keycloak minor version

* update maven plugin

* add --no-progress to uds tasks

* test ci output

* update common and progress

* cleanup no progress tags

* add task no progress tag back in

* add no progress to zarf build
  • Loading branch information
UnicornChance authored Apr 22, 2024
1 parent 18b14eb commit b6ab9e0
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:

- name: Install commitlint
run: |
npm install --save-dev @commitlint/config-conventional@19.0.3
npm install --save-dev @commitlint/cli@19.0.3
npm install --save-dev @commitlint/config-conventional@19.2.2
npm install --save-dev @commitlint/cli@19.2.2
- name: Lint PR title
env:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tag-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Create release tag
id: tag
uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e # v4
uses: google-github-actions/release-please-action@a37ac6e4f6449ce8b3f7607e4d97d0146028dc0b # v4.1.0
with:
command: manifest # use configs in release-please-config.json
- id: release-flag
Expand All @@ -34,22 +34,22 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0
- uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0

- name: Set up Homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: Install UDS CLI
shell: bash
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.9.2
run: brew install defenseunicorns/tap/uds@0.10.4

- name: "Login to GHCR"
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
with:
registry: ghcr.io
username: dummy
password: ${{ github.token }}

- name: Build and Publish
run: uds run build-and-publish
run: uds run build-and-publish --no-progress
20 changes: 10 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.10.3
uses: defenseunicorns/uds-common/.github/actions/setup@a6fba9c0084319325d70816a3481aec0979649fa # v0.4.0

- name: Test building the docker image
run: uds run dev-build
run: uds run dev-build --no-progress

zarf_build:
runs-on: ubuntu-latest
Expand All @@ -40,10 +40,10 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.10.3
uses: defenseunicorns/uds-common/.github/actions/setup@a6fba9c0084319325d70816a3481aec0979649fa # v0.4.0

- name: Test building a zarf package
run: uds run build-zarf-pkg
run: uds run build-zarf-pkg --no-progress

plugin_unit_tests:
runs-on: ubuntu-latest
Expand All @@ -57,10 +57,10 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.10.3
uses: defenseunicorns/uds-common/.github/actions/setup@a6fba9c0084319325d70816a3481aec0979649fa # v0.4.0

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -80,10 +80,10 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.10.3
uses: defenseunicorns/uds-common/.github/actions/setup@a6fba9c0084319325d70816a3481aec0979649fa # v0.4.0

- name: Smoke Tests
run: uds run uds-core-smoke-test
run: uds run uds-core-smoke-test --no-progress

uds_core_cypress_integration:
runs-on: ubuntu-latest
Expand All @@ -97,7 +97,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@5e4414dc25302739063bb58aa96b8afef5be9851 # v0.10.3
uses: defenseunicorns/uds-common/.github/actions/setup@a6fba9c0084319325d70816a3481aec0979649fa # v0.4.0

- name: Cypress Integration Tests
run: uds run uds-core-integration-tests
run: uds run uds-core-integration-tests --no-progress
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"yaml.schemas": {
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.9.2/tasks.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [
"tasks.yaml",
"tasks/**/*.yaml",
"src/**/validate.yaml"
],
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.9.2/zarf.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [
"zarf.yaml"
]
},
Expand Down
4 changes: 2 additions & 2 deletions bundles/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- name: init
repository: ghcr.io/defenseunicorns/packages/init
# renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
ref: v0.32.5
ref: v0.33.0

- name: keycloak-identity-config
path: ../
Expand All @@ -22,7 +22,7 @@ packages:
- name: core-slim-dev
path: ../uds-core/build/
# renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver
ref: 0.19.0
ref: 0.20.0
overrides:
keycloak:
keycloak:
Expand Down
6 changes: 3 additions & 3 deletions src/plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<keycloak.version>24.0.2</keycloak.version>
<keycloak.version>24.0.3</keycloak.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
Expand All @@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
9 changes: 4 additions & 5 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ variables:
- name: CORE_VERSION
description: UDS Core Version for Releases and Clone
# renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver
# default: "v0.19.0"
default: "main"
default: "v0.20.0"

tasks:
- name: build-and-publish
Expand Down Expand Up @@ -123,10 +122,10 @@ tasks:
- name: build-deploy-custom-slim
description: "Build/Deploy custom slim dev bundle for integration testing"
actions:
- cmd: uds zarf package create . --confirm --set=IDENTITY_CONFIG_IMG=uds-core-config:keycloak
- cmd: uds zarf package create . --confirm --set=IDENTITY_CONFIG_IMG=uds-core-config:keycloak --no-progress
- cmd: cd uds-core && uds run create:slim-dev-package
- cmd: uds create bundles --confirm
- cmd: uds deploy bundles/uds-bundle-k3d-core-slim-dev-*.tar.zst --set=core-slim-dev.KEYCLOAK_CONFIG_IMAGE=uds-core-config:keycloak --confirm
- cmd: uds create bundles --confirm --no-tea --no-progress
- cmd: uds deploy bundles/uds-bundle-k3d-core-slim-dev-*.tar.zst --set=core-slim-dev.KEYCLOAK_CONFIG_IMAGE=uds-core-config:keycloak --confirm --no-tea --no-progress

- name: cypress-tests
description: "Run all cypress tests ( requires an existing deployed UDS Core Identity )"
Expand Down

0 comments on commit b6ab9e0

Please sign in to comment.