diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5674782..edb4058 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,4 +12,4 @@ updates:
target-branch: "master"
directory: "/"
schedule:
- interval: "daily"
\ No newline at end of file
+ interval: "daily"
diff --git a/.github/workflows/actions-audit.yaml b/.github/workflows/actions-audit.yaml
deleted file mode 100644
index 8e84aed..0000000
--- a/.github/workflows/actions-audit.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# This workflow is managed by application-workflows; any changes will be lost.
-# yamllint disable-line rule:line-length
-# Source: https://github.com/RentTheRunway/application-workflows/tree/main/workflow-templates/github-helpers/actions-audit.yaml.tpl
----
-
-name: Github Actions Audit
-run-name: Audit ${{ github.event.repository.name }}
-
-on:
- workflow_dispatch:
- schedule:
- - cron: "30 21 * * 0,2,4"
-
-jobs:
- actions-audit:
- # yamllint disable-line rule:line-length
- uses: RentTheRunway/infrastructure-workflows/.github/workflows/github-actions.yaml@main
- secrets: inherit
diff --git a/.github/workflows/other-pr-checks.yml b/.github/workflows/other-pr-checks.yml
new file mode 100644
index 0000000..b9701d2
--- /dev/null
+++ b/.github/workflows/other-pr-checks.yml
@@ -0,0 +1,23 @@
+---
+
+name: Other PR Checks
+on: # yamllint disable-line rule:truthy
+ pull_request:
+
+jobs:
+ other-pr-checks:
+ name: Other PR Checks
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repo
+ uses: actions/checkout@v4
+
+ - name: Run YAML linting
+ uses: karancode/yamllint-github-action@v2.1.1
+ with:
+ yamllint_strict: true
+
+ - name: Run woke
+ uses: get-woke/woke-action@v0
+ with:
+ fail-on-error: true
diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-build-and-test.yaml
similarity index 63%
rename from .github/workflows/pr-validation.yaml
rename to .github/workflows/pr-build-and-test.yaml
index df05197..2b23f3c 100644
--- a/.github/workflows/pr-validation.yaml
+++ b/.github/workflows/pr-build-and-test.yaml
@@ -29,24 +29,10 @@ jobs:
with:
maven-version: 3.9.6
- - name: Set up Maven servers
- uses: whelk-io/maven-settings-xml-action@v21
- with:
- servers: '[
- {
- "id": "sonatype-nexus-staging",
- "username": "${{ secrets.OSS_NEXUS_USERNAME }}",
- "password": "${{ secrets.OSS_NEXUS_PASSWORD }}"
- },
- {
- "id": "sonatype-nexus-snapshots",
- "username": "${{ secrets.OSS_NEXUS_USERNAME }}",
- "password": "${{ secrets.OSS_NEXUS_PASSWORD }}"
- }]'
-
- name: Resolve plugins
run: mvn dependency:resolve-plugins
+ # dependency:analyze-only is run during the main build, but they sometimes catch different things
- name: Run dependency analysis
run: mvn dependency:analyze
diff --git a/.github/workflows/woke.yml b/.github/workflows/woke.yml
deleted file mode 100644
index b8280bc..0000000
--- a/.github/workflows/woke.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: woke
-on: [ pull_request ]
-
-jobs:
- woke:
- name: woke
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
-
- # For more details, see https://github.com/marketplace/actions/run-woke
- - uses: get-woke/woke-action@v0
- with:
- fail-on-error: true
diff --git a/conduit-bom/pom.xml b/conduit-bom/pom.xml
index c3f79a8..0d46397 100644
--- a/conduit-bom/pom.xml
+++ b/conduit-bom/pom.xml
@@ -15,7 +15,7 @@
5.14.2
- 1.2.11
+ 1.2.13
1.7.36
diff --git a/pom.xml b/pom.xml
index 4d7e9be..317d611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,15 @@
HEAD
+
+
+ Matthew Read
+ MatthewRyanRead@users.noreply.github.com
+ Rent the Runway
+ https://github.com/RentTheRunway
+
+
+
ossrh