From 07e9dc66b96ece4645bf47c7b656cec50227c93a Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Wed, 24 Apr 2024 02:16:32 +0900 Subject: [PATCH] GitHub Actions Tidy-up (#3114) - Allow CodeQL workflow to be run from GitHub Actions WebUI at any time - Set CodeQL to also check for best practises/code problems (as well as security) - Capitalize Publish GH Action - Change Windows Test workflow for consistent file extension (also means its formatted with Prettier) and remove leading empty linebreak - Run Prettier (maybe we should add this to build script to ensure all code is formatted?) - Change .gitattributes to have LF line-endings for more file types --- .gitattributes | 2 ++ .github/workflows/codeql-analysis.yml | 2 ++ .github/workflows/publish.yml | 2 +- .github/workflows/{test-windows.yaml => test-windows.yml} | 3 +-- .github/workflows/test.yml | 2 +- CHANGELOG.md | 3 ++- docs/about-this-repo.md | 3 ++- gulpfile.mjs | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) rename .github/workflows/{test-windows.yaml => test-windows.yml} (96%) diff --git a/.gitattributes b/.gitattributes index b6858178..476bf56d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,6 +16,8 @@ *.js text eol=lf *.json text eol=lf *.md text eol=lf +*.mjs text eol=lf *.sh text eol=lf *.txt text eol=lf *.xml text eol=lf +*.yml text eol=lf diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e807d4a8..824eb007 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,6 +9,7 @@ on: branches: - main - "!dependabot/**" + workflow_dispatch: jobs: analyze: @@ -27,6 +28,7 @@ jobs: uses: github/codeql-action/init@v3 with: languages: "javascript" + queries: +security-and-quality - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c63bc563..5ce65da9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: publish +name: Publish on: push: diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yml similarity index 96% rename from .github/workflows/test-windows.yaml rename to .github/workflows/test-windows.yml index 6b30640f..3ff6e456 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yml @@ -1,5 +1,4 @@ - -name: Build status +name: Build status (Windows) on: push: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9983cf17..559c6be6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Build status +name: Build status (Ubuntu) on: push: diff --git a/CHANGELOG.md b/CHANGELOG.md index 844696c9..4fe66636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,15 @@ # Changelog ## 9.0.1 (April 11, 2023) + - Fixed tests on Windows, adds Windows Testing Action [#3110](https://github.com/h5bp/html5-boilerplate/pull/3110) - Add og:image:alt for accessibility [#3066](https://github.com/h5bp/html5-boilerplate/pull/3066) - Upgrade to Gulp 5 [#3100](https://github.com/h5bp/html5-boilerplate/pull/3100) [#3105](https://github.com/h5bp/html5-boilerplate/pull/3105) - ci: Use GITHUB_OUTPUT envvar instead of set-output command [#3068](https://github.com/h5bp/html5-boilerplate/pull/3068) - Readme and Changelog updates [#3055](https://github.com/h5bp/html5-boilerplate/pull/3055) [#3057](https://github.com/h5bp/html5-boilerplate/pull/3057) [#3064](https://github.com/h5bp/html5-boilerplate/pull/3064) - ## 9.0.0 (December 6, 2023) + - Removing tile images [#3023](https://github.com/h5bp/html5-boilerplate/pull/3023) - Add Prettier [#3011](https://github.com/h5bp/html5-boilerplate/pull/3011) - Remove Modernizr [#3002](https://github.com/h5bp/html5-boilerplate/issues/3002) diff --git a/docs/about-this-repo.md b/docs/about-this-repo.md index e296ae45..95f39fd8 100644 --- a/docs/about-this-repo.md +++ b/docs/about-this-repo.md @@ -95,7 +95,8 @@ of our `.github` folder. file of our `dist` folder. - `push-to-template.yml` pushes the `HEAD` of `main` to our template repo - `spellcheck.yml` automatically checks markdown files for typos with cSpell. - - `test.yml` runs our test suite. + - `test.yml` runs our test suite on Ubuntu. + - `test-windows.yml` runs our test suite on Windows. - `CODE_OF_CONDUCT.md` is our Code of Conduct, based on [Contributor Covenant.](https://www.contributor-covenant.org/) - `CONTRIBUTING.md` contains our contribution guidelines. diff --git a/gulpfile.mjs b/gulpfile.mjs index a8df19fa..c0139cce 100644 --- a/gulpfile.mjs +++ b/gulpfile.mjs @@ -107,7 +107,7 @@ gulp.task('copy:misc', () => // (other tasks will handle the copying of these files) `!${dirs.src}/css/main.css`, `!${dirs.src}/index.html`, - `!**/.DS_Store` + `!**/.DS_Store`, ], { encoding: false,