Skip to content

Commit 987af47

Browse files
committed
Merge branch 'main' into feature/prebid-npm-integration
2 parents f24971c + 775dc72 commit 987af47

18 files changed

Lines changed: 337 additions & 206 deletions

.github/dependabot.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: 'cargo' # See documentation for possible values
9+
directory: '/' # Location of package manifests
10+
schedule:
11+
interval: 'weekly'
12+
13+
- package-ecosystem: 'npm' # See documentation for possible values
14+
directory: 'crates/js/lib/' # Location of package manifests
15+
schedule:
16+
interval: 'weekly'
17+
18+
- package-ecosystem: 'npm' # See documentation for possible values
19+
directory: 'docs/' # Location of package manifests
20+
schedule:
21+
interval: 'weekly'

.github/workflows/codeql.yml

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL Advanced"
13+
14+
on:
15+
push:
16+
branches: [ "main" ]
17+
pull_request:
18+
branches: [ "main" ]
19+
schedule:
20+
- cron: '42 6 * * 0'
21+
22+
jobs:
23+
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
permissions:
32+
# required for all workflows
33+
security-events: write
34+
35+
# required to fetch internal or private CodeQL packs
36+
packages: read
37+
38+
# only required for workflows in private repositories
39+
actions: read
40+
contents: read
41+
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
include:
46+
- language: actions
47+
build-mode: none
48+
- language: javascript-typescript
49+
build-mode: none
50+
- language: rust
51+
build-mode: none
52+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
53+
# Use `c-cpp` to analyze code written in C, C++ or both
54+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
55+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
56+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
57+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
58+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
59+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
60+
steps:
61+
- name: Checkout repository
62+
uses: actions/checkout@v4
63+
64+
# Add any setup steps before running the `github/codeql-action/init` action.
65+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
66+
# or others). This is typically only required for manual builds.
67+
# - name: Setup runtime (example)
68+
# uses: actions/setup-example@v1
69+
70+
# Initializes the CodeQL tools for scanning.
71+
- name: Initialize CodeQL
72+
uses: github/codeql-action/init@v4
73+
with:
74+
languages: ${{ matrix.language }}
75+
build-mode: ${{ matrix.build-mode }}
76+
# If you wish to specify custom queries, you can do so here or in a config file.
77+
# By default, queries listed here will override any specified in a config file.
78+
# Prefix the list here with "+" to use these queries and those in the config file.
79+
80+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
81+
# queries: security-extended,security-and-quality
82+
83+
# If the analyze step fails for one of the languages you are analyzing with
84+
# "We were unable to automatically build your code", modify the matrix above
85+
# to set the build mode to "manual" for that language. Then modify this step
86+
# to build your code.
87+
# ℹ️ Command-line programs to run using the OS shell.
88+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
89+
- name: Run manual build steps
90+
if: matrix.build-mode == 'manual'
91+
shell: bash
92+
run: |
93+
echo 'If you are using a "manual" build mode for one or more of the' \
94+
'languages you are analyzing, replace this with the commands to build' \
95+
'your code, for example:'
96+
echo ' make bootstrap'
97+
echo ' make release'
98+
exit 1
99+
100+
- name: Perform CodeQL Analysis
101+
uses: github/codeql-action/analyze@v4
102+
with:
103+
category: "/language:${{matrix.language}}"

.github/workflows/format.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19-
- name: Cache cargo dependencies
20-
uses: actions/cache@v4
21-
with:
22-
path: |
23-
~/.cargo/bin/
24-
~/.cargo/registry/index/
25-
~/.cargo/registry/cache/
26-
~/.cargo/git/db/
27-
target/
28-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
29-
3019
- name: Retrieve Rust version
3120
id: rust-version
3221
run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
@@ -35,11 +24,10 @@ jobs:
3524
- name: Set up rust toolchain
3625
uses: actions-rust-lang/setup-rust-toolchain@v1
3726
with:
38-
components: "clippy, rustfmt"
3927
toolchain: ${{ steps.rust-version.outputs.rust-version }}
40-
41-
- name: Add wasm32-wasi target
42-
run: rustup target add wasm32-wasip1
28+
target: wasm32-wasip1
29+
components: "clippy, rustfmt"
30+
cache-shared-key: cargo-${{ runner.os }}
4331

4432
- name: Run cargo fmt
4533
uses: actions-rust-lang/rustfmt@v1

.github/workflows/test.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19-
- name: Cache Cargo dependencies
20-
uses: actions/cache@v4
21-
with:
22-
path: |
23-
~/.cargo/bin/
24-
~/.cargo/registry/index/
25-
~/.cargo/registry/cache/
26-
~/.cargo/git/db/
27-
target/
28-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
29-
3019
- name: Retrieve Rust version
3120
id: rust-version
3221
run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
3322
shell: bash
3423

35-
- name: Set up Rust tool chain
24+
- name: Set up Rust toolchain
3625
uses: actions-rust-lang/setup-rust-toolchain@v1
3726
with:
3827
toolchain: ${{ steps.rust-version.outputs.rust-version }}
28+
target: wasm32-wasip1
29+
cache-shared-key: cargo-${{ runner.os }}
3930

40-
- name: Add wasm32-wasi target
41-
run: rustup target add wasm32-wasip1
31+
- name: Get Viceroy cache key
32+
id: viceroy-rev
33+
run: echo "sha=$(git ls-remote https://github.com/fastly/Viceroy HEAD | cut -f1)" >> $GITHUB_OUTPUT
34+
35+
- name: Cache Viceroy binary
36+
id: cache-viceroy
37+
uses: actions/cache@v4
38+
with:
39+
path: ~/.cargo/bin/viceroy
40+
key: viceroy-${{ runner.os }}-${{ steps.viceroy-rev.outputs.sha }}
4241

43-
- name: Setup Viceroy (from main since 0.14.3 is broken)
42+
- name: Install Viceroy (from main since 0.14.3 is broken)
43+
if: steps.cache-viceroy.outputs.cache-hit != 'true'
4444
run: cargo install --git https://github.com/fastly/Viceroy viceroy
4545

4646
- name: Run tests

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ src/*.html
1818
.claude
1919
.specstory
2020
.vscode
21+
22+
# SSL certificates
23+
*.pem

Cargo.lock

Lines changed: 40 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)