Skip to content

Commit 7d1f872

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/deploy-pages-5.0.0
2 parents d082852 + 79bcddc commit 7d1f872

10 files changed

Lines changed: 409 additions & 16 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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: '35 9 * * 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: ruby
51+
build-mode: none
52+
53+
steps:
54+
- name: Checkout repository
55+
uses: actions/checkout@v4
56+
# Initializes the CodeQL tools for scanning.
57+
- name: Initialize CodeQL
58+
uses: github/codeql-action/init@v4
59+
with:
60+
languages: ${{ matrix.language }}
61+
build-mode: ${{ matrix.build-mode }}
62+
63+
- name: Run manual build steps
64+
if: matrix.build-mode == 'manual'
65+
shell: bash
66+
run: |
67+
echo 'If you are using a "manual" build mode for one or more of the' \
68+
'languages you are analyzing, replace this with the commands to build' \
69+
'your code, for example:'
70+
echo ' make bootstrap'
71+
echo ' make release'
72+
exit 1
73+
74+
- name: Perform CodeQL Analysis
75+
uses: github/codeql-action/analyze@v4
76+
with:
77+
category: "/language:${{matrix.language}}"

.github/workflows/jekyll-preview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ jobs:
3636
ref: ${{ github.event.pull_request.head.sha }}
3737
repository: ${{ github.event.pull_request.head.repo.full_name }}
3838
- name: Setup Pages
39-
uses: actions/configure-pages@v5.0.0
39+
uses: actions/configure-pages@v6.0.0
4040
- name: Build with Jekyll
4141
uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 # v1
4242
with:
4343
source: ./
4444
destination: ./_site
4545
- name: Upload artifact
4646
# Automatically uploads an artifact from the './_site' directory by default
47-
uses: actions/upload-pages-artifact@v4.0.0
47+
uses: actions/upload-pages-artifact@v5.0.0
4848
# Deployment job
4949
deploy:
5050
environment:

.github/workflows/jekyll.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
- name: Checkout
3030
uses: actions/checkout@v6.0.2
3131
- name: Setup Pages
32-
uses: actions/configure-pages@v5.0.0
32+
uses: actions/configure-pages@v6.0.0
3333
- name: Build with Jekyll
3434
uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 # v1
3535
with:
3636
source: ./
3737
destination: ./_site
3838
- name: Upload artifact
3939
# Automatically uploads an artifact from the './_site' directory by default
40-
uses: actions/upload-pages-artifact@v4.0.0
40+
uses: actions/upload-pages-artifact@v5.0.0
4141
# Deployment job
4242
deploy:
4343
environment:

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: GitHub Actions CI
22
on:
33
push:
4-
branches: master
4+
branches: main
55
pull_request:
66
merge_group:
77
permissions:

Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,26 +273,26 @@ GEM
273273
minitest (5.27.0)
274274
net-http (0.9.1)
275275
uri (>= 0.11.1)
276-
nokogiri (1.19.2)
276+
nokogiri (1.19.3)
277277
mini_portile2 (~> 2.8.2)
278278
racc (~> 1.4)
279-
nokogiri (1.19.2-aarch64-linux-gnu)
279+
nokogiri (1.19.3-aarch64-linux-gnu)
280280
racc (~> 1.4)
281-
nokogiri (1.19.2-aarch64-linux-musl)
281+
nokogiri (1.19.3-aarch64-linux-musl)
282282
racc (~> 1.4)
283-
nokogiri (1.19.2-arm-linux-gnu)
283+
nokogiri (1.19.3-arm-linux-gnu)
284284
racc (~> 1.4)
285-
nokogiri (1.19.2-arm-linux-musl)
285+
nokogiri (1.19.3-arm-linux-musl)
286286
racc (~> 1.4)
287-
nokogiri (1.19.2-arm64-darwin)
287+
nokogiri (1.19.3-arm64-darwin)
288288
racc (~> 1.4)
289-
nokogiri (1.19.2-x64-mingw-ucrt)
289+
nokogiri (1.19.3-x64-mingw-ucrt)
290290
racc (~> 1.4)
291-
nokogiri (1.19.2-x86_64-darwin)
291+
nokogiri (1.19.3-x86_64-darwin)
292292
racc (~> 1.4)
293-
nokogiri (1.19.2-x86_64-linux-gnu)
293+
nokogiri (1.19.3-x86_64-linux-gnu)
294294
racc (~> 1.4)
295-
nokogiri (1.19.2-x86_64-linux-musl)
295+
nokogiri (1.19.3-x86_64-linux-musl)
296296
racc (~> 1.4)
297297
octokit (4.25.1)
298298
faraday (>= 1, < 3)

0 commit comments

Comments
 (0)