Compare commits

..

9 Commits

Author SHA1 Message Date
Jess Bees ead53d0c8a Update debug messages
Docker / build (push) Has been cancelled
2022-03-23 14:05:59 -04:00
Jess Bees e2b13747b8 Temporary: repoint action to use published feature branch image 2022-03-22 13:48:08 -04:00
Jess Bees d0c3f534f8 Unrelated: fix a pair of shellcheck lints 2022-03-22 13:43:22 -04:00
Jess Bees 68107d3ea8 Emit telemetry after building
This commit duplicates the telemetry logic in the actions/deploy-pages action.
This Gemfile already pulls in Faraday as a dependency of octokit; the change to
Gemfile just makes its use explicit. There aren't any changes when you compare
the resulting Gemfile.lock.
2022-03-22 11:38:34 -04:00
Yoann Chaudet e2cc96e2ea Merge pull request #28 from actions/yoannchaudet-patch-1
Docker / build (push) Has been cancelled
Prep 1.0.2 release
2022-03-03 20:28:27 -08:00
Yoann Chaudet 7ee131980c Prep 1.0.2 release 2022-03-03 20:27:51 -08:00
Yoann Chaudet 0b9e0d5ae1 Merge pull request #26 from actions/dependabot/bundler/test_projects/mojombo/nokogiri-1.13.3
Bump nokogiri from 1.6.8.1 to 1.13.3 in /test_projects/mojombo
2022-03-03 20:26:56 -08:00
dependabot[bot] b749a008bc Bump nokogiri from 1.6.8.1 to 1.13.3 in /test_projects/mojombo
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.6.8.1 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.6.8.1...v1.13.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-04 04:24:17 +00:00
Yoann Chaudet e08a1986ae Merge pull request #27 from actions/bump-github-pages
Bump github-pages to 225
2022-03-03 20:23:37 -08:00
7 changed files with 55 additions and 6 deletions
+1
View File
@@ -20,6 +20,7 @@ ENV LANGUAGE en_US.UTF-8
ENV LC_ALL en_US.UTF-8
COPY entrypoint.sh /entrypoint.sh
COPY bin/emit_telemetry /emit_telemetry
ENTRYPOINT ["/entrypoint.sh"]
+1
View File
@@ -12,3 +12,4 @@ gem "github-pages", "= 225"
# even though it is included in the original GitHub Pages build infrastructure.
gem "jekyll-include-cache", "= 0.2.1"
gem "jekyll-octicons", "~> 14.2"
gem "faraday", "~> 1.10"
+1 -1
View File
@@ -27,4 +27,4 @@ inputs:
default: ${{ github.token }}
runs:
using: 'docker'
image: 'docker://ghcr.io/actions/jekyll-build-pages:v1.0.1'
image: 'docker://ghcr.io/actions/jekyll-build-pages:feature-emit-telemetry'
+43
View File
@@ -0,0 +1,43 @@
#! /usr/bin/env ruby
require "faraday"
require "faraday/retry"
require "json"
ACTION_NWO = ENV["GITHUB_ACTION_REPOSITORY"]
REPOSITORY_NWO = ENV["GITHUB_REPOSITORY"]
GITHUB_RUN_ID = ENV["GITHUB_RUN_ID"]
GITHUB_TOKEN = ENV["INPUT_TOKEN"]
TELEMETRY_URL = "https://api.github.com/repos/#{REPOSITORY_NWO}/pages/telemetry"
RETRY_COUNT = 3
RETRY_OPTIONS = {
max: RETRY_COUNT,
methods: [:post],
retry_statuses: [500, 502, 503, 504],
interval: 1,
backoff_factor: 2,
}
begin
connection = Faraday.new { |f| f.request :retry, RETRY_OPTIONS }
response = connection.post(
TELEMETRY_URL,
{ github_run_id: GITHUB_RUN_ID }.to_json,
{
Accept: 'application/vnd.github.v3+json',
Authorization: "Bearer #{GITHUB_TOKEN}",
'Content-type': 'application/json',
'User-Agent': "#{ACTION_NWO} Faraday #{Faraday::VERSION}",
},
)
if response.success?
STDERR.puts "Sending telemetry for run id #{GITHUB_RUN_ID}"
else response.success?
STDERR.puts "Failed to emit pages build telemetry to #{TELEMETRY_URL} : returned status code: #{response.status} after #{RETRY_COUNT + 1} attempts"
STDERR.puts response.body if response.body
end
rescue e
STDERR.puts "Failed to emit pages build telemetry: #{e}"
end
+2 -2
View File
@@ -5,9 +5,9 @@ if [ "local" = "$1" ]; then
export PAGES_REPO_NWO=actions/jekyll-build-pages
export JEKYLL_BUILD_REVISION=JEKYLL_BUILD_REVISION
for dir in $(ls test_projects)
for dir in test_projects/*
do
bundle exec github-pages build --verbose -s test_projects/$dir -d test_projects/$dir/_expected
bundle exec github-pages build --verbose -s "$dir" -d "$dir/_expected"
done
else
act -b -s GITHUB_TOKEN -j record-expected-output
+2
View File
@@ -35,3 +35,5 @@ fi
cd "$PAGES_GEM_HOME"
$GITHUB_PAGES build "$VERBOSE" "$FUTURE" --source "$SOURCE_DIRECTORY" --destination "$DESTINATION_DIRECTORY"
/emit_telemetry
+5 -3
View File
@@ -101,18 +101,20 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.1.0)
mini_portile2 (2.8.0)
minima (2.0.0)
minitest (5.9.1)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.6.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
public_suffix (1.5.3)
racc (1.6.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)