Skip to content

Commit

Permalink
Merge branch 'main' into 1823
Browse files Browse the repository at this point in the history
  • Loading branch information
cmwylie19 authored Feb 27, 2025
2 parents 757144c + cf8d3a9 commit 49ade32
Show file tree
Hide file tree
Showing 56 changed files with 2,784 additions and 2,425 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
with:
category: "/language:${{matrix.language}}"

16 changes: 8 additions & 8 deletions .github/workflows/load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ jobs:
npx ts-node hack/load.cli.ts prep ./
- name: upload pepr package artifact (.tgz)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: tgz
path: "**/pepr-0.0.0-development.tgz"
if-no-files-found: error
retention-days: 30

- name: upload pepr controller image artifact (.tar)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: tar
path: "**/pepr-dev.tar"
Expand Down Expand Up @@ -92,15 +92,15 @@ jobs:
capabilities/configmap.yaml
- name: upload raw test inject log (actress)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: actress.log
path: "**/load/*-actress.log"
if-no-files-found: error
retention-days: 30

- name: upload raw test sample log (audience)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: audience.log
path: "**/load/*-audience.log"
Expand All @@ -113,23 +113,23 @@ jobs:
npx ts-node hack/load.cli.ts post
- name: upload parsed inject log (actress)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: actress.json
path: "**/load/*-actress.json"
if-no-files-found: error
retention-days: 30

- name: upload parsed sample log (audience)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: audience.json
path: "**/load/*-audience.json"
if-no-files-found: error
retention-days: 30

- name: upload load test summary
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: summary.json
path: "**/load/*-summary.json"
Expand All @@ -142,7 +142,7 @@ jobs:
npx ts-node hack/load.cli.ts graph
- name: upload load test result graph (watcher)
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: watcher.png
path: "**/load/*.png"
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/node.js-unicorn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Node.js Unicorn CI

on:
workflow_dispatch:
push:
branches: ["main"]
pull_request:
branches: ["main"]
merge_group:
paths-ignore:
- "LICENSE"
- "CODEOWNERS"
- "**.md"


permissions:
id-token: write # This is needed for OIDC federation.
contents: read

jobs:
journey-unicorn:
if: github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Use Node.js 22
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 22
cache: "npm"
- name: Setup Helm
uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
with:
version: v3.3.4
- name: "Install K3d"
run: "curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash"
shell: bash

- name: Chainguard Login
uses: chainguard-dev/setup-chainctl@2302a56a61228140753b428d1018cb0d0addbec6 # v0.3.0
with:
identity: ${{ secrets.CHAINGUARD_IDENTITY }}

- run: npm ci
- run: |
npm run test:journey:unicorn
npm run test:journey-wasm:unicorn
66 changes: 15 additions & 51 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,61 +10,24 @@ on:
- "LICENSE"
- "CODEOWNERS"
- "**.md"

permissions:
id-token: write # This is needed for OIDC federation.
contents: read

jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Use Node.js latest
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: latest
cache: "npm"
- run: npm ci
- run: npm run format:check

test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- run: npm ci
- run: npm run test:unit
- name: Upload coverage to Codecov
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}

integration:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Use Node.js 22
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 22
cache: "npm"
- name: Setup Helm
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
with:
version: v3.3.4

- run: npm ci
- run: npm run test:integration
on-demand-workflows:
uses: ./.github/workflows/on-demand-workflows.yaml
secrets:
CODECOV_ORG_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}
with:
run-format: true
run-units: true
run-integration: true

journey:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

Expand All @@ -74,13 +37,14 @@ jobs:
node-version: 22
cache: "npm"
- name: Setup Helm
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
with:
version: v3.3.4
- name: "Install K3d"
run: "curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash"
shell: bash

- run: npm ci
- run: npm run test:journey
- run: npm run test:journey-wasm
- run: |
npm run test:journey
npm run test:journey-wasm
86 changes: 86 additions & 0 deletions .github/workflows/on-demand-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# Workflows that can be called on demand
name: on-demand-workflows

on:
workflow_call:
inputs:
run-format:
description: "Run format check"
required: false
default: false
type: boolean
run-units:
description: "Run unit tests"
required: false
default: false
type: boolean
run-integration:
description: "Run integration tests"
required: false
default: false
type: boolean
node-version:
description: "Node.js version"
required: false
type: string

secrets:
CODECOV_ORG_TOKEN:
required: true
CHAINGUARD_IDENTITY:
required: false

permissions:
id-token: write # This is needed for OIDC federation.
contents: read

jobs:
format:
if: inputs.run-format == true
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Use Node.js latest
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: latest
cache: "npm"
- run: npm ci
- run: npm run format:check

test:
if: inputs.run-units == true
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20, 22]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- run: npm ci
- run: npm run test:unit
- name: Upload coverage to Codecov
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}

integration:
if: inputs.run-integration == true
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Use Node.js 22
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 22
cache: "npm"
- name: Setup Helm
uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
with:
version: v3.3.4
- run: npm ci
- run: npm run test:integration
Loading

0 comments on commit 49ade32

Please sign in to comment.