Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into support-arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
harryzcy committed Apr 5, 2024
2 parents 761ccfb + fd2c7cc commit abeb9dc
Show file tree
Hide file tree
Showing 26 changed files with 1,097 additions and 1,053 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "6.3.0"
".": "6.3.1"
}
16 changes: 8 additions & 8 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Login to GHCR
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Start deployment
uses: bobheadxi/deployments@v1.4.0
uses: bobheadxi/deployments@v1.5.0
id: deployment
with:
step: start
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
target: "${{ matrix.images.target }}"

- name: Update deployment
uses: bobheadxi/deployments@v1.4.0
uses: bobheadxi/deployments@v1.5.0
# We depend on the 'deployment' step outputs, so we can't run this step
# if the 'deployment' step didn't run. This can happen if any step
# before the 'deployment' step fails. That's why 'always()' is not
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:

- name: Start deployment
if: steps.release.outputs.release_created
uses: bobheadxi/deployments@v1.4.0
uses: bobheadxi/deployments@v1.5.0
id: deployment
with:
step: start
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
- name: Login to GHCR
if: steps.release.outputs.release_created
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -233,7 +233,7 @@ jobs:
# Instead, we pull the latest image and tag it.
- name: Retag and Push Images
if: steps.release.outputs.release_created
uses: akhilerm/tag-push-action@v2.1.0
uses: akhilerm/tag-push-action@v2.2.0
with:
src: ghcr.io/super-linter/super-linter:latest
dst: |
Expand All @@ -242,7 +242,7 @@ jobs:
- name: Retag and Push Images slim
if: steps.release.outputs.release_created
uses: akhilerm/tag-push-action@v2.1.0
uses: akhilerm/tag-push-action@v2.2.0
with:
src: ghcr.io/super-linter/super-linter:slim-latest
dst: |
Expand All @@ -267,7 +267,7 @@ jobs:
git push --force origin latest
- name: Update deployment
uses: bobheadxi/deployments@v1.4.0
uses: bobheadxi/deployments@v1.5.0
# We depend on the 'deployment' step outputs, so we can't run this step
# if the 'deployment' step didn't run. This can happen if any step
# before the 'deployment' step fails. That's why 'always()' is not
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-automation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- name: Fetch Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
# This doesn't trigger an automated merge because we require at approvals
Expand Down
71 changes: 71 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,76 @@
# Changelog

## [6.3.1](https://github.com/super-linter/super-linter/compare/v6.3.0...v6.3.1) (2024-04-04)


### 🐛 Bugfixes

* do not print the whole environment ([#5473](https://github.com/super-linter/super-linter/issues/5473)) ([39edf76](https://github.com/super-linter/super-linter/commit/39edf76351164a520b3df903a47c7b06379ccf11))
* remove cpanm cache ([#5385](https://github.com/super-linter/super-linter/issues/5385)) ([b00466d](https://github.com/super-linter/super-linter/commit/b00466d6b14849f7bfb859022b6938494de2f685))
* revert eslint-config and enable strict checks ([#5423](https://github.com/super-linter/super-linter/issues/5423)) ([3e1c570](https://github.com/super-linter/super-linter/commit/3e1c570d32a733a5b82e493bf95fba76e4017694)), closes [#5422](https://github.com/super-linter/super-linter/issues/5422)


### ⬆️ Dependency updates

* **bundler:** bump rubocop from 1.60.2 to 1.61.0 in /dependencies ([#5359](https://github.com/super-linter/super-linter/issues/5359)) ([20da02a](https://github.com/super-linter/super-linter/commit/20da02ac5c82089b3973de737bdda323153b4d31))
* **bundler:** bump rubocop from 1.61.0 to 1.62.1 in /dependencies ([#5372](https://github.com/super-linter/super-linter/issues/5372)) ([22debee](https://github.com/super-linter/super-linter/commit/22debeed5fdbd7b898737d9c851b3960e8af66fe))
* **bundler:** bump rubocop-minitest in /dependencies ([#5371](https://github.com/super-linter/super-linter/issues/5371)) ([8974415](https://github.com/super-linter/super-linter/commit/897441590d803420d3cbbb0bd13549d99f3c7947))
* **bundler:** bump rubocop-rails from 2.23.1 to 2.24.0 in /dependencies ([#5358](https://github.com/super-linter/super-linter/issues/5358)) ([dceea3d](https://github.com/super-linter/super-linter/commit/dceea3dd60bb55d5e32fe85acef70705a3120a86))
* **bundler:** bump rubocop-rspec from 2.26.1 to 2.27.1 in /dependencies ([#5360](https://github.com/super-linter/super-linter/issues/5360)) ([630d44b](https://github.com/super-linter/super-linter/commit/630d44b158733bafd0c70eb297871dd0e7d9d89f))
* **bundler:** bump standard from 1.34.0 to 1.35.1 in /dependencies ([#5426](https://github.com/super-linter/super-linter/issues/5426)) ([69cc492](https://github.com/super-linter/super-linter/commit/69cc4921a28a97fe0bd2df787ff18a89ff81b3c9))
* **dev-docker:** bump node in /dev-dependencies ([#5390](https://github.com/super-linter/super-linter/issues/5390)) ([4650e8e](https://github.com/super-linter/super-linter/commit/4650e8e811927e5f0dbfeb8b1c43edabb3f763b5))
* **dev-npm:** bump @commitlint/cli in /dev-dependencies ([#5396](https://github.com/super-linter/super-linter/issues/5396)) ([b34674f](https://github.com/super-linter/super-linter/commit/b34674f20b4891ff43139773f7096cb88e515da8))
* **dev-npm:** bump @commitlint/config-conventional in /dev-dependencies ([#5395](https://github.com/super-linter/super-linter/issues/5395)) ([a79e071](https://github.com/super-linter/super-linter/commit/a79e0713081befa22a7e39b48aa8bc41c5519dc7))
* **dev-npm:** bump release-please in /dev-dependencies ([#5394](https://github.com/super-linter/super-linter/issues/5394)) ([10b5245](https://github.com/super-linter/super-linter/commit/10b5245d84a15e2d0b480889be737b393fe73906))
* **docker:** bump alpine/terragrunt from 1.7.4 to 1.7.5 ([#5389](https://github.com/super-linter/super-linter/issues/5389)) ([a72dd13](https://github.com/super-linter/super-linter/commit/a72dd13e76ca62bbd44ff7b6198b7e087bb81ec3))
* **docker:** bump clj-kondo/clj-kondo ([#5388](https://github.com/super-linter/super-linter/issues/5388)) ([81ab1ad](https://github.com/super-linter/super-linter/commit/81ab1ad60b2ec949177bf1a185f12f57dcc27786))
* **docker:** bump dart from 3.3.0-sdk to 3.3.1-sdk ([#5368](https://github.com/super-linter/super-linter/issues/5368)) ([d21db8d](https://github.com/super-linter/super-linter/commit/d21db8d843ddbf70634ca9d2eb78a23e4f80387a))
* **docker:** bump golang from 1.22.0-alpine to 1.22.1-alpine ([#5366](https://github.com/super-linter/super-linter/issues/5366)) ([63a458f](https://github.com/super-linter/super-linter/commit/63a458fa812b278b08b3c3f1616aeefa3d305812))
* **docker:** bump hashicorp/terraform from 1.7.4 to 1.7.5 ([#5387](https://github.com/super-linter/super-linter/issues/5387)) ([abfcf4e](https://github.com/super-linter/super-linter/commit/abfcf4e3d58537f512a8f974277327f8db2c0605))
* **docker:** bump koalaman/shellcheck from v0.9.0 to v0.10.0 ([#5365](https://github.com/super-linter/super-linter/issues/5365)) ([4f182d7](https://github.com/super-linter/super-linter/commit/4f182d764ef46059fb6d1182365098678f0eb9ba))
* **docker:** bump yoheimuta/protolint from 0.47.6 to 0.49.3 ([#5386](https://github.com/super-linter/super-linter/issues/5386)) ([5fcd592](https://github.com/super-linter/super-linter/commit/5fcd5927d44fb2aad575dd0cf3b54b5d50eac27e))
* **github-actions:** bump actions/download-artifact from 4.1.2 to 4.1.4 ([#5361](https://github.com/super-linter/super-linter/issues/5361)) ([af522a6](https://github.com/super-linter/super-linter/commit/af522a60bb37acabb27684dfc32e433b88187722))
* **github-actions:** bump akhilerm/tag-push-action from 2.1.0 to 2.2.0 ([#5392](https://github.com/super-linter/super-linter/issues/5392)) ([156d046](https://github.com/super-linter/super-linter/commit/156d0463d75b1e841b495701a3f56c63a351cbc8))
* **github-actions:** bump docker/login-action from 3.0.0 to 3.1.0 ([#5391](https://github.com/super-linter/super-linter/issues/5391)) ([9ad7a43](https://github.com/super-linter/super-linter/commit/9ad7a43a7d0556925b8b306d825e81a6f6b45a4c))
* **java:** bump com.google.googlejavaformat:google-java-format ([#5364](https://github.com/super-linter/super-linter/issues/5364)) ([cb595ba](https://github.com/super-linter/super-linter/commit/cb595bae8bb63fedb0f19558fef91cd3ee480cd7))
* **java:** bump com.pinterest.ktlint:ktlint-cli in /dependencies/ktlint ([#5354](https://github.com/super-linter/super-linter/issues/5354)) ([a40f1d8](https://github.com/super-linter/super-linter/commit/a40f1d828b3b200303994a13305eb0763e37d58b))
* **java:** bump com.puppycrawl.tools:checkstyle ([#5355](https://github.com/super-linter/super-linter/issues/5355)) ([25e8c22](https://github.com/super-linter/super-linter/commit/25e8c22379a6fc1aa8fd768b04731a2e351fdb56))
* **java:** bump com.puppycrawl.tools:checkstyle ([#5393](https://github.com/super-linter/super-linter/issues/5393)) ([93ba832](https://github.com/super-linter/super-linter/commit/93ba8329903b295130a588a636679575bde113f2))
* **npm:** bump @ibm/tekton-lint in /dependencies ([#5408](https://github.com/super-linter/super-linter/issues/5408)) ([a07571a](https://github.com/super-linter/super-linter/commit/a07571acb8fd707c92007a40c3b8b98be0d628e4))
* **npm:** bump @react-native/eslint-config in /dependencies ([#5417](https://github.com/super-linter/super-linter/issues/5417)) ([6e35bed](https://github.com/super-linter/super-linter/commit/6e35bed01240b6979036730db25219ea4d49e371))
* **npm:** bump @typescript-eslint/eslint-plugin in /dependencies ([#5352](https://github.com/super-linter/super-linter/issues/5352)) ([4b99bb9](https://github.com/super-linter/super-linter/commit/4b99bb9d334c19fc1e46fdbdb4157dacc6920c2f))
* **npm:** bump @typescript-eslint/eslint-plugin in /dependencies ([#5418](https://github.com/super-linter/super-linter/issues/5418)) ([c312285](https://github.com/super-linter/super-linter/commit/c3122858d6fd5e0d3baff7d3d37de9375590efd8))
* **npm:** bump eslint-plugin-jsonc in /dependencies ([#5420](https://github.com/super-linter/super-linter/issues/5420)) ([ed2d6a4](https://github.com/super-linter/super-linter/commit/ed2d6a4775ec76e327141683d447251453c06563))
* **npm:** bump eslint-plugin-react in /dependencies ([#5351](https://github.com/super-linter/super-linter/issues/5351)) ([b801d8d](https://github.com/super-linter/super-linter/commit/b801d8d3d15583bff964948af465c72ecc3982a0))
* **npm:** bump eslint-plugin-react in /dependencies ([#5406](https://github.com/super-linter/super-linter/issues/5406)) ([3ebbbf7](https://github.com/super-linter/super-linter/commit/3ebbbf74c49cb8450d06872a1c9140f4bcdc878d))
* **npm:** bump eslint-plugin-vue from 9.22.0 to 9.23.0 in /dependencies ([#5397](https://github.com/super-linter/super-linter/issues/5397)) ([41af8fc](https://github.com/super-linter/super-linter/commit/41af8fc21c97d8664ee6950f062a91cc15597450))
* **npm:** bump next from 14.1.0 to 14.1.1 in /dependencies ([#5353](https://github.com/super-linter/super-linter/issues/5353)) ([a5c0d35](https://github.com/super-linter/super-linter/commit/a5c0d35e57245c30181f05e62c4986aea78edf6a))
* **npm:** bump next from 14.1.1 to 14.1.3 in /dependencies ([#5377](https://github.com/super-linter/super-linter/issues/5377)) ([34bd610](https://github.com/super-linter/super-linter/commit/34bd610cf7fafcb55e6b1c4e81ee765d5bbe4525))
* **npm:** bump npm-groovy-lint from 14.2.2 to 14.2.3 in /dependencies ([#5346](https://github.com/super-linter/super-linter/issues/5346)) ([fa9b638](https://github.com/super-linter/super-linter/commit/fa9b6383da387c6ece86807b6c00725ff1444e22))
* **npm:** bump npm-groovy-lint from 14.2.3 to 14.2.4 in /dependencies ([#5410](https://github.com/super-linter/super-linter/issues/5410)) ([49efd84](https://github.com/super-linter/super-linter/commit/49efd848cf44a87039e68a57d5a58ec407977f5b))
* **npm:** bump react-router-dom from 6.22.1 to 6.22.2 in /dependencies ([#5349](https://github.com/super-linter/super-linter/issues/5349)) ([770c355](https://github.com/super-linter/super-linter/commit/770c355b6aa249d27063169cb1e858713a51b8c2))
* **npm:** bump react-router-dom from 6.22.2 to 6.22.3 in /dependencies ([#5373](https://github.com/super-linter/super-linter/issues/5373)) ([0e6d8ff](https://github.com/super-linter/super-linter/commit/0e6d8ff0acae47f2d268af8d9806faa7a13bcbf7))
* **npm:** bump renovate from 37.214.0 to 37.226.1 in /dependencies ([#5350](https://github.com/super-linter/super-linter/issues/5350)) ([d84ef4c](https://github.com/super-linter/super-linter/commit/d84ef4cac179551a1d854e225f351576f4ddd292))
* **npm:** bump renovate from 37.226.1 to 37.263.0 in /dependencies ([#5416](https://github.com/super-linter/super-linter/issues/5416)) ([3504f7c](https://github.com/super-linter/super-linter/commit/3504f7c31784e30aaf130adf875a78558c76d4ff))
* **npm:** bump textlint from 14.0.3 to 14.0.4 in /dependencies ([#5409](https://github.com/super-linter/super-linter/issues/5409)) ([dee0abf](https://github.com/super-linter/super-linter/commit/dee0abf34fcaa47fef21fcf5a2df41cc1417f92f))
* **npm:** bump typescript from 5.3.3 to 5.4.2 in /dependencies ([#5374](https://github.com/super-linter/super-linter/issues/5374)) ([aa3ca06](https://github.com/super-linter/super-linter/commit/aa3ca066f415c5cd5e91764ac9b697ddd348d3b9))
* **python:** bump ansible-lint in /dependencies/python ([#5402](https://github.com/super-linter/super-linter/issues/5402)) ([6e55e1a](https://github.com/super-linter/super-linter/commit/6e55e1ae30aeb14de549b8ac3a43a92830aa95c5))
* **python:** bump black from 24.2.0 to 24.3.0 in /dependencies/python ([#5405](https://github.com/super-linter/super-linter/issues/5405)) ([e410312](https://github.com/super-linter/super-linter/commit/e410312bdfbeec55180c88c443b91b7c57309bba))
* **python:** bump cfn-lint in /dependencies/python ([#5356](https://github.com/super-linter/super-linter/issues/5356)) ([421f6f4](https://github.com/super-linter/super-linter/commit/421f6f49db8013e6ea2c4bdb88fe5ed9ad54a159))
* **python:** bump cfn-lint in /dependencies/python ([#5379](https://github.com/super-linter/super-linter/issues/5379)) ([e7191df](https://github.com/super-linter/super-linter/commit/e7191df78f28bd2fa2d3fd4c8a099114e68ddea8))
* **python:** bump checkov from 3.2.26 to 3.2.30 in /dependencies/python ([#5357](https://github.com/super-linter/super-linter/issues/5357)) ([4843854](https://github.com/super-linter/super-linter/commit/4843854209030f414230f6d326309fd7ee2ad8db))
* **python:** bump checkov from 3.2.30 to 3.2.39 in /dependencies/python ([#5401](https://github.com/super-linter/super-linter/issues/5401)) ([148746f](https://github.com/super-linter/super-linter/commit/148746f01766799621e7fce4994009a183d47069))
* **python:** bump mypy from 1.8.0 to 1.9.0 in /dependencies/python ([#5380](https://github.com/super-linter/super-linter/issues/5380)) ([4b38d74](https://github.com/super-linter/super-linter/commit/4b38d74238a921616d7a1bdabee63e2ab8eb0588))
* **python:** bump snakemake from 8.5.3 to 8.9.0 in /dependencies/python ([#5425](https://github.com/super-linter/super-linter/issues/5425)) ([3ec9980](https://github.com/super-linter/super-linter/commit/3ec9980fe40da3fd163a8b039b08a135e8f511b0))
* **python:** bump sqlfluff from 2.3.5 to 3.0.2 in /dependencies/python ([#5404](https://github.com/super-linter/super-linter/issues/5404)) ([9211b37](https://github.com/super-linter/super-linter/commit/9211b377d08e4a4072086dff280f914455750d33))


### 🧰 Maintenance

* add glibc via gcompat layer ([#5334](https://github.com/super-linter/super-linter/issues/5334)) ([252a980](https://github.com/super-linter/super-linter/commit/252a98096191286de3794b2aba5f09593169a01c))
* **docker:** update psscript analyzer to 1.22.0 ([#5428](https://github.com/super-linter/super-linter/issues/5428)) ([6842e2d](https://github.com/super-linter/super-linter/commit/6842e2d3cc468d1b9c4523349e8eec808338539b))
* install zlib from alpine packages ([#5317](https://github.com/super-linter/super-linter/issues/5317)) ([1eea612](https://github.com/super-linter/super-linter/commit/1eea6127e151aaf9914ed716475d020a416447d6))

## [6.3.0](https://github.com/super-linter/super-linter/compare/v6.2.0...v6.3.0) (2024-02-28)


Expand Down
21 changes: 11 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
# Get dependency images as build stages #
#########################################
FROM tenable/terrascan:1.18.11 as terrascan
FROM alpine/terragrunt:1.7.4 as terragrunt
FROM alpine/terragrunt:1.7.5 as terragrunt
FROM dotenvlinter/dotenv-linter:3.3.0 as dotenv-linter
FROM ghcr.io/terraform-linters/tflint:v0.50.3 as tflint
FROM ghcr.io/yannh/kubeconform:v0.6.4 as kubeconfrm
FROM golang:1.22.0-alpine as golang
FROM golangci/golangci-lint:v1.56.2 as golangci-lint
FROM golang:1.22.1-alpine as golang
FROM golangci/golangci-lint:v1.57.2 as golangci-lint
FROM hadolint/hadolint:v2.12.0-alpine as dockerfile-lint
FROM hashicorp/terraform:1.7.4 as terraform
FROM koalaman/shellcheck:v0.9.0 as shellcheck
FROM hashicorp/terraform:1.7.5 as terraform
FROM koalaman/shellcheck:v0.10.0 as shellcheck
FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
FROM mvdan/shfmt:v3.8.0 as shfmt
FROM rhysd/actionlint:1.6.27 as actionlint
FROM scalameta/scalafmt:v3.8.0 as scalafmt-source
FROM zricethezav/gitleaks:v8.18.2 as gitleaks
FROM yoheimuta/protolint:0.47.6 as protolint
FROM ghcr.io/clj-kondo/clj-kondo:2024.03.05 as clj-kondo
FROM dart:3.3.0-sdk as dart
FROM yoheimuta/protolint:0.49.3 as protolint
FROM ghcr.io/clj-kondo/clj-kondo:2024.03.13 as clj-kondo
FROM dart:3.3.3-sdk as dart
FROM mcr.microsoft.com/dotnet/sdk:8.0.101-alpine3.19 as dotnet-sdk
FROM mcr.microsoft.com/powershell:7.4-alpine-3.17 as powershell-source

Expand Down Expand Up @@ -87,7 +87,7 @@ RUN apk add --no-cache \
COPY dependencies/package.json dependencies/package-lock.json /
RUN apk add --no-cache --virtual .node-build-deps \
npm \
&& npm install \
&& npm install --strict-peer-deps \
&& npm cache clean --force \
&& chown -R "$(id -u)":"$(id -g)" node_modules \
&& rm -rfv package.json package-lock.json
Expand Down Expand Up @@ -239,6 +239,7 @@ RUN apk add --no-cache --virtual .perl-build-deps \
Perl::Critic::StricterSubs \
Perl::Critic::Swift \
Perl::Critic::Tics \
&& rm -rf /root/.cpanm \
&& apk del --no-network --purge .perl-build-deps

#################
Expand Down Expand Up @@ -508,7 +509,7 @@ COPY --from=powershell /opt/microsoft/powershell /opt/microsoft/powershell
ARG TARGETARCH
# Disable Powershell telemetry
ENV POWERSHELL_TELEMETRY_OPTOUT=1
ARG PSSA_VERSION='1.21.0'
ARG PSSA_VERSION='1.22.0'
RUN if [[ "${TARGETARCH}" == "amd64" ]]; then \
PS_INSTALL_FOLDER="$(cat /tmp/PS_INSTALL_FOLDER)" \
&& echo "PS_INSTALL_FOLDER: ${PS_INSTALL_FOLDER}" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ To run super-linter as a GitHub Action, you do the following:
fetch-depth: 0

- name: Super-linter
uses: super-linter/[email protected].0 # x-release-please-version
uses: super-linter/[email protected].1 # x-release-please-version
env:
# To report GitHub Actions status checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: 'Super-linter contributors'
description: 'Super-linter is a ready-to-run collection of linters and code analyzers, to help validate your source code.'
runs:
using: 'docker'
image: 'docker://ghcr.io/super-linter/super-linter:v6.3.0' # x-release-please-version
image: 'docker://ghcr.io/super-linter/super-linter:v6.3.1' # x-release-please-version
branding:
icon: 'check-square'
color: 'white'
Expand Down

0 comments on commit abeb9dc

Please sign in to comment.