Skip to content

Commit

Permalink
Bump github/codeql-action from 3.25.10 to 3.25.11 (#128)
Browse files Browse the repository at this point in the history
Bumps [github/codeql-action](https://github.com/github/codeql-action)
from 3.25.10 to 3.25.11.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/github/codeql-action/blob/main/CHANGELOG.md">github/codeql-action's
changelog</a>.</em></p>
<blockquote>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<p>Note that the only difference between <code>v2</code> and
<code>v3</code> of the CodeQL Action is the node version they support,
with <code>v3</code> running on node 20 while we continue to release
<code>v2</code> to support running on node 16. For example
<code>3.22.11</code> was the first <code>v3</code> release and is
functionally identical to <code>2.22.11</code>. This approach ensures an
easy way to track exactly which features are included in different
versions, indicated by the minor and patch version numbers.</p>
<h2>[UNRELEASED]</h2>
<p>No user facing changes.</p>
<h2>3.25.11 - 28 Jun 2024</h2>
<ul>
<li>Avoid failing the workflow run if there is an error while uploading
debug artifacts. <a
href="https://redirect.github.com/github/codeql-action/pull/2349">#2349</a></li>
<li>Update default CodeQL bundle version to 2.17.6. <a
href="https://redirect.github.com/github/codeql-action/pull/2352">#2352</a></li>
</ul>
<h2>3.25.10 - 13 Jun 2024</h2>
<ul>
<li>Update default CodeQL bundle version to 2.17.5. <a
href="https://redirect.github.com/github/codeql-action/pull/2327">#2327</a></li>
</ul>
<h2>3.25.9 - 12 Jun 2024</h2>
<ul>
<li>Avoid failing database creation if the database folder already
exists and contains some unexpected files. Requires CodeQL 2.18.0 or
higher. <a
href="https://redirect.github.com/github/codeql-action/pull/2330">#2330</a></li>
<li>The init Action will attempt to clean up the database cluster
directory before creating a new database and at the end of the job. This
will help to avoid issues where the database cluster directory is left
in an inconsistent state. <a
href="https://redirect.github.com/github/codeql-action/pull/2332">#2332</a></li>
</ul>
<h2>3.25.8 - 04 Jun 2024</h2>
<ul>
<li>Update default CodeQL bundle version to 2.17.4. <a
href="https://redirect.github.com/github/codeql-action/pull/2321">#2321</a></li>
</ul>
<h2>3.25.7 - 31 May 2024</h2>
<ul>
<li>We are rolling out a feature in May/June 2024 that will reduce the
Actions cache usage of the Action by keeping only the newest TRAP cache
for each language. <a
href="https://redirect.github.com/github/codeql-action/pull/2306">#2306</a></li>
</ul>
<h2>3.25.6 - 20 May 2024</h2>
<ul>
<li>Update default CodeQL bundle version to 2.17.3. <a
href="https://redirect.github.com/github/codeql-action/pull/2295">#2295</a></li>
</ul>
<h2>3.25.5 - 13 May 2024</h2>
<ul>
<li>Add a compatibility matrix of supported CodeQL Action, CodeQL CLI,
and GitHub Enterprise Server versions to the <a
href="https://github.com/github/codeql-action/blob/main/README.md">https://github.com/github/codeql-action/blob/main/README.md</a>.
<a
href="https://redirect.github.com/github/codeql-action/pull/2273">#2273</a></li>
<li>Avoid printing out a warning for a missing <code>on.push</code>
trigger when the CodeQL Action is triggered via a
<code>workflow_call</code> event. <a
href="https://redirect.github.com/github/codeql-action/pull/2274">#2274</a></li>
<li>The <code>tools: latest</code> input to the <code>init</code> Action
has been renamed to <code>tools: linked</code>. This option specifies
that the Action should use the tools shipped at the same time as the
Action. The old name will continue to work for backwards compatibility,
but we recommend that new workflows use the new name. <a
href="https://redirect.github.com/github/codeql-action/pull/2281">#2281</a></li>
</ul>
<h2>3.25.4 - 08 May 2024</h2>
<ul>
<li>Update default CodeQL bundle version to 2.17.2. <a
href="https://redirect.github.com/github/codeql-action/pull/2270">#2270</a></li>
</ul>
<h2>3.25.3 - 25 Apr 2024</h2>
<ul>
<li>Update default CodeQL bundle version to 2.17.1. <a
href="https://redirect.github.com/github/codeql-action/pull/2247">#2247</a></li>
<li>Workflows running on <code>macos-latest</code> using CodeQL CLI
versions before v2.15.1 will need to either upgrade their CLI version to
v2.15.1 or newer, or change the platform to an Intel MacOS runner, such
as <code>macos-12</code>. ARM machines with SIP disabled, including the
newest <code>macos-latest</code> image, are unsupported for CLI versions
before 2.15.1. <a
href="https://redirect.github.com/github/codeql-action/pull/2261">#2261</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/github/codeql-action/commit/b611370bb5703a7efb587f9d136a52ea24c5c38c"><code>b611370</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/2357">#2357</a>
from github/update-v3.25.11-de945755c</li>
<li><a
href="https://github.com/github/codeql-action/commit/3e6431f3accd84bb42779fc3c9d9f447caa3a6d3"><code>3e6431f</code></a>
Update changelog for v3.25.11</li>
<li><a
href="https://github.com/github/codeql-action/commit/de945755c9edd3a4e5d160a71f1482ece6a3c271"><code>de94575</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/2352">#2352</a>
from github/update-bundle/codeql-bundle-v2.17.6</li>
<li><a
href="https://github.com/github/codeql-action/commit/a32d3058b827f5d2ba08dc2570887f14b164a794"><code>a32d305</code></a>
Add changelog note</li>
<li><a
href="https://github.com/github/codeql-action/commit/9ccc99508a819cb9c340028d7711b129f96c8a2e"><code>9ccc995</code></a>
Update default bundle to codeql-bundle-v2.17.6</li>
<li><a
href="https://github.com/github/codeql-action/commit/9b7c22c3b39078582fa6d0d8f3841e944ec54582"><code>9b7c22c</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/2351">#2351</a>
from github/dependabot/npm_and_yarn/npm-6791eaa26c</li>
<li><a
href="https://github.com/github/codeql-action/commit/9cf3243b0be3a9e0efff20a7fabd5a11246168e9"><code>9cf3243</code></a>
Rebuild</li>
<li><a
href="https://github.com/github/codeql-action/commit/1895b29ac8e2046ddb708ac1eca53e6d5e143337"><code>1895b29</code></a>
Update checked-in dependencies</li>
<li><a
href="https://github.com/github/codeql-action/commit/9dcfde966d641c9a59ee02a83f18329a2b2caace"><code>9dcfde9</code></a>
Bump the npm group with 2 updates</li>
<li><a
href="https://github.com/github/codeql-action/commit/8723b5be41df185b62efd22191bb83fc24539ca0"><code>8723b5b</code></a>
Merge pull request <a
href="https://redirect.github.com/github/codeql-action/issues/2350">#2350</a>
from github/angelapwen/add-exclude-pr-check-param</li>
<li>Additional commits viewable in <a
href="https://github.com/github/codeql-action/compare/23acc5c183826b7a8a97bce3cecc52db901f8251...b611370bb5703a7efb587f9d136a52ea24c5c38c">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github/codeql-action&package-manager=github_actions&previous-version=3.25.10&new-version=3.25.11)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
  • Loading branch information
Zeitsperre authored Jul 2, 2024
2 parents 3dad69d + 1979b4b commit 4023362
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ clean-test: ## remove test and coverage artifacts
rm -fr .pytest_cache

lint/flake8: ## check style with flake8
ruff xdatasets tests
ruff check xdatasets tests
flake8 --config=.flake8 xdatasets tests

lint/black: ## check style with black
Expand Down
2 changes: 1 addition & 1 deletion xdatasets/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def load_query(
# Try naively merging datasets into single dataset
ds = None

if type(dsets[0]) == xr.Dataset:
if isinstance(dsets[0], xr.Dataset):
# if more than one dataset, then we add source as a dimension
# so we can merge two or more datasets together
if len(dsets) > 1:
Expand Down

0 comments on commit 4023362

Please sign in to comment.