Skip to content

Commit

Permalink
Merge branch 'main' into spell
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasleplus authored Oct 22, 2024
2 parents 082c577 + 399e5ad commit c3f669d
Show file tree
Hide file tree
Showing 18 changed files with 168 additions and 72 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ body:
label: Is there an existing issue for this?
description: Search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
Expand All @@ -36,7 +36,7 @@ body:
description: |
Version where you observed this issue
placeholder: |
vX.Y.Z
vX.Y.Z
render: markdown
validations:
required: true
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ body:
render: markdown
validations:
required: false

15 changes: 13 additions & 2 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: 'Dependabot auto-merge'
name: "Dependabot auto-merge"
on: pull_request

permissions:
Expand All @@ -17,7 +17,18 @@ jobs:
if: env.RELEASE_TOKEN != ''
run: echo "${RELEASE_TOKEN}" | gh auth login --with-token
- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --squash "$PR_URL"
run: |
gh pr merge --auto --squash "${PR_URL}"
# Checking the PR title is a poor substitute for the actual PR changes
# but as long as this is used only with dependabot PRs,
# it should be safe to assume that the title is not misleading.
regexp='^Bump .* from [0-9]+\.[0-9]+\.[0-9]+ to [0-9]+\.[0-9]+\.[0-9]+( in .*)?$'
if [[ "${PR_TITLE}" =~ $regexp ]]; then
gh pr review --approve "${PR_URL}"
else
echo 'Non-semver upgrade needs manual review'
fi
env:
PR_TITLE: ${{github.event.pull_request.title}}
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
56 changes: 28 additions & 28 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0'
- cron: "0 0 * * 0"
workflow_dispatch:

permissions: {}
Expand All @@ -30,41 +30,41 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Checkout repository
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
queries: +security-and-quality
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
queries: +security-and-quality

# 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@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
# 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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
8 changes: 4 additions & 4 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: 'Dependency Review'
name: "Dependency Review"
on: [pull_request]

permissions:
Expand All @@ -9,7 +9,7 @@ jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: 'Dependency Review'
- name: "Checkout Repository"
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: "Dependency Review"
uses: actions/dependency-review-action@0659a74c94536054bfa5aeb92241f70d680cc78e # v4
15 changes: 7 additions & 8 deletions .github/workflows/jslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0'
- cron: "0 0 * * 0"
workflow_dispatch:

permissions: {}

jobs:

check:
name: Check with JSLint
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Install JSLint
run: sudo npm install -g jslint
- name: Run JSLint
run: jslint --browser javascripts/*.js
- name: Check out
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: Install JSLint
run: sudo npm install -g jslint
- name: Run JSLint
run: jslint --browser javascripts/*.js
22 changes: 7 additions & 15 deletions .github/workflows/osv-scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,24 @@ name: OSV-Scanner

on:
pull_request:
branches: [ "main" ]
branches: ["main"]
push:
branches: [ "main" ]
branches: ["main"]
schedule:
- cron: '0 0 * * 0'
- cron: "0 0 * * 0"
workflow_dispatch:

permissions:
# Require writing security events to upload SARIF file to security tab
security-events: write
# Read commit contents
contents: read
# Actions read-only
actions: read

jobs:
scan-scheduled:
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@75532bf0bf75464b047d80414dbce04449498365" # v1.7.3
with:
# Example of specifying custom arguments
scan-args: |-
-r
--skip-git
./
scan-pr:
if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@75532bf0bf75464b047d80414dbce04449498365" # v1.7.3
scan:
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@19ec1116569a47416e11a45848722b1af31a857b" # v1.9.0
with:
# Example of specifying custom arguments
scan-args: |-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Update PRs

on:
push:
schedule:
- cron: '0 0 * * 0'
workflow_dispatch:

permissions:
Expand All @@ -28,12 +26,14 @@ jobs:
})
const prs = await github.paginate(opts)
for (const pr of prs) {
core.debug(JSON.stringify(pr))
core.info(`Updating PR #${pr.number}`)
github.rest.pulls.updateBranch({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: pr.number,
}).then(function(result) {
core.debug(JSON.stringify(result))
core.info(JSON.stringify(result.data))
}).catch(function(error) {
core.error(error)
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0'
- cron: "0 0 * * 0"
workflow_dispatch:

permissions: {}

jobs:

check:
name: Check with YAMLLint
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Install YAMLLint
run: sudo pip install yamllint
- name: Run YAMLLint
run: "yamllint -d '{extends: relaxed, rules: {line-length: disable, trailing-spaces: disable}}' ."
- name: Check out
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: Install YAMLLint
run: sudo pip install yamllint
- name: Run YAMLLint
run: "yamllint -d '{extends: relaxed, rules: {line-length: disable, trailing-spaces: disable}}' ."
12 changes: 12 additions & 0 deletions javascripts/Search Amazon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://www.amazon.com/s?k=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search Bing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://www.bing.com/search?q=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search DuckDuckGo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://duckduckgo.com/?q=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search Google.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://www.google.com/search?udm=14&q=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search Reddit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://www.reddit.com/search?q=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search StackOverflow.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://stackoverflow.com/search?q=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search Wikipedia.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://en.wikipedia.org/w/index.php?title=Special:Search&search=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
12 changes: 12 additions & 0 deletions javascripts/Search YouTube.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use strict";
var selection;
if (window.getSelection) {
selection = window.getSelection().toString();
} else if (document.selection && document.selection.type !== "Control") {
selection = document.selection.createRange().text;
}
if (selection === undefined) {
window.alert('Select the desired text to search.');
} else {
window.open('https://www.youtube.com/results?search_query=' + encodeURIComponent(selection.trim()), '_blank').focus();
}
2 changes: 1 addition & 1 deletion javascripts/Search site.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"use strict";
location.href = 'https://www.google.com/search?q=site%3A' + encodeURIComponent(location.hostname);
location.href = 'https://www.google.com/search?udm=14&q=site%3A' + encodeURIComponent(location.hostname);

0 comments on commit c3f669d

Please sign in to comment.