diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d9249a52545..0323d522ef3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: build run: script/bootstrap diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml new file mode 100644 index 00000000000..2e939a01811 --- /dev/null +++ b/.github/workflows/publish-gem.yml @@ -0,0 +1,22 @@ +name: Publish Gem + +on: + release: + types: [released] + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.2' + - name: Build gem + run: | + gem build github-pages.gemspec + - name: Publish + run: | + gem push github-pages.gem --key ${{ secrets.PAGES_GEM_PUBLISH }} diff --git a/README.md b/README.md index 4c2fac074ba..14922872b5b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,8 @@ Additionally, you may choose to set the following optional variables: ```yml show_downloads: ["true" or "false" (unquoted) to indicate whether to provide a download URL] -google_analytics: [Your Google Analytics tracking ID] +google_analytics_v4: [Your Google Analytics tracking ID if you use new Google Analytics v4 (GA4)] +google_analytics: [Your legacy Universal Analytics (UA) tracking ID, for backward compatibility] ``` ### Stylesheet @@ -71,6 +72,7 @@ If you'd like to change the theme's HTML layout: ### Customizing Google Analytics code Google has released several iterations to their Google Analytics code over the years since this theme was first created. If you would like to take advantage of the latest code, paste it into `_includes/head-custom-google-analytics.html` in your Jekyll site. +Alternatively, set `google_analytics_v4:` (for new Google Analytics v4; GA4) or `google_analytics:` (for old Universal Analytics; UA) in `_config.yml`. ### Overriding GitHub-generated URLs diff --git a/_includes/head-custom-google-analytics-v4.html b/_includes/head-custom-google-analytics-v4.html new file mode 100644 index 00000000000..6892f97f41f --- /dev/null +++ b/_includes/head-custom-google-analytics-v4.html @@ -0,0 +1,11 @@ +{% if site.google_analytics_v4 %} + + + +{% endif %} diff --git a/_includes/head-custom.html b/_includes/head-custom.html index 44cdb83f523..fdcf2a65811 100644 --- a/_includes/head-custom.html +++ b/_includes/head-custom.html @@ -4,7 +4,10 @@ {% include head-custom-theme-colors.html %} + {% include head-custom-google-analytics.html %} + +{% include head-custom-google-analytics-v4.html %} diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 37bc385828b..f59423126a9 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -77,6 +77,9 @@ At a high level, [the process for proposing changes](https://guides.github.com/i `script/cibuild` +## Publishing Gem +In order to publish the Gem bump the version in *this file*, commit, create a tag with the new version number, and finally push the commit and tag to the repo. + ## Code of conduct This project is governed by [the Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. diff --git a/script/validate-html b/script/validate-html index 43d8fca8945..8f51642ea54 100755 --- a/script/validate-html +++ b/script/validate-html @@ -20,7 +20,7 @@ def validate(file) return puts "Valid!" if results.errors.empty? - results.errors.each { |err| puts err.to_s } + results.errors.each { |err| puts err } exit 1 end