diff --git a/.github/super-linter.env b/.github/super-linter.env deleted file mode 100644 index 7ce7647b4..000000000 --- a/.github/super-linter.env +++ /dev/null @@ -1,11 +0,0 @@ -VALIDATE_ALL_CODEBASE=true -VALIDATE_CSS=false -VALIDATE_DOCKERFILE_HADOLINT=false -VALIDATE_EDITORCONFIG=false -VALIDATE_GITLEAKS=false -VALIDATE_HTML=false -VALIDATE_JAVASCRIPT_STANDARD=false -VALIDATE_JSCPD=false -VALIDATE_JSON=false -VALIDATE_MARKDOWN=false -VALIDATE_NATURAL_LANGUAGE=false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 213783ab7..dcb5c310e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,13 +6,10 @@ on: jobs: lint: - # Run GH Super-Linter against code base runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: cat .github/super-linter.env >> "$GITHUB_ENV" - - name: Lint Code Base - uses: github/super-linter@v4 + - name: MegaLinter + uses: oxsecurity/megalinter-cupcake@v7.3.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DEFAULT_BRANCH: develop \ No newline at end of file diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 3d9580b2e..cafe59769 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -52,7 +52,7 @@ jobs: JEKYLL_ENV: production PAGES_REPO_NWO: ${{ github.repository }} JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + - name: Upload artifact # Automatically uploads an artifact from the './_site' directory by default uses: actions/upload-pages-artifact@v1 diff --git a/.mega-linter.yml b/.mega-linter.yml new file mode 100644 index 000000000..60c774730 --- /dev/null +++ b/.mega-linter.yml @@ -0,0 +1,21 @@ +# Configuration file for MegaLinter +# See all available variables at https://megalinter.io/configuration/ and in linters documentation + +APPLY_FIXES: none +DISABLE: + - SPELL + - REPOSITORY + - JSON + - MARKDOWN + - JAVASCRIPT + - CSS + - HTML + - COPYPASTE +DISABLE_LINTERS: + - YAML_V8R +PRINT_ALL_FILES: false +DOCKERFILE_HADOLINT_ARGUMENTS: "--ignore DL3008 --ignore DL4006 --ignore DL3009 --ignore DL3059" +SHOW_ELAPSED_TIME: true +FLAVOR_SUGGESTIONS: false +EMAIL_REPORTER: false +FILEIO_REPORTER: false diff --git a/_config.yml b/_config.yml index 622f501c6..9a9b5bd5c 100644 --- a/_config.yml +++ b/_config.yml @@ -3,6 +3,7 @@ greeting: Welcome to JKAN description: A lightweight, backend-free open data portal, powered by Jekyll. logo: /img/jkan.png hero_image: /img/homepage-hero.jpg +strict_front_matter: true # Site theme jkan_theme: Default @@ -87,7 +88,6 @@ plugins: - "jekyll-paginate-v2" - "jekyll-titles-from-headings" - # Exclude these files from the build exclude: - CONTRIBUTING.md diff --git a/_data/themes.yml b/_data/themes.yml index 6cbcd59ae..a2206fc8d 100644 --- a/_data/themes.yml +++ b/_data/themes.yml @@ -1,6 +1,6 @@ - name: Default logo: /img/themes/default.png - src: '' + src: "" - name: Cerulean logo: /img/themes/cerulean.png src: https://stackpath.bootstrapcdn.com/bootswatch/4.2.1/cerulean/bootstrap.min.css diff --git a/docker-compose.yml b/docker-compose.yml index 7a5895484..6b76cb708 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: - LANG=C.UTF-8 command: jekyll serve --watch --incremental --host 0.0.0.0 ports: - - '4000:4000' + - "4000:4000" volumes: - .:/srv/jekyll - ./vendor/bundle:/usr/local/bundle diff --git a/editor/decap-cms.yml b/editor/decap-cms.yml index d850f39af..b3570ebbc 100644 --- a/editor/decap-cms.yml +++ b/editor/decap-cms.yml @@ -171,7 +171,7 @@ collections: - label: Base URL name: baseurl widget: string - + - name: licenses label: Licenses description: Dataset licenses @@ -181,7 +181,7 @@ collections: name: items label_singular: License widget: list - fields: + fields: - label: Name name: name widget: string diff --git a/scripts/lint b/scripts/lint index 1736fc2b9..7dc7f940f 100755 --- a/scripts/lint +++ b/scripts/lint @@ -1,4 +1,2 @@ -docker run --rm \ - -e RUN_LOCAL=true \ - --env-file ".github/super-linter.env" \ - -v "$PWD":/tmp/lint github/super-linter:v4 \ No newline at end of file +docker run --rm -v $PWD:/tmp/lint oxsecurity/megalinter-cupcake +