From 8c3d765eb687bb08dddc2b23eeda96f5b652f786 Mon Sep 17 00:00:00 2001 From: Martin Leduc <31558169+DecimalTurn@users.noreply.github.com> Date: Fri, 21 Jun 2024 20:43:34 -0400 Subject: [PATCH 1/4] Display short commit name --- .github/workflows/sync-linguist.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync-linguist.yml b/.github/workflows/sync-linguist.yml index fe63451..2b7177d 100644 --- a/.github/workflows/sync-linguist.yml +++ b/.github/workflows/sync-linguist.yml @@ -22,6 +22,7 @@ jobs: set -euo pipefail IFS=$'\n\t' commit=$(sed --quiet --regexp-extended 's/[[:space:]]+commit[[:space:]]+=[[:space:]]"([a-f0-9]{40})"/\1/p' internal/code-generator/generator/generator_test.go) + echo "Previous commit: ${commit::8}" echo "::set-output name=commit::$commit" echo "::set-output name=short_commit::${commit::8}" - uses: actions/checkout@v2 From be5250bb9833f8ac27f636e1b8b3e47fb00c8657 Mon Sep 17 00:00:00 2001 From: Martin Leduc <31558169+DecimalTurn@users.noreply.github.com> Date: Fri, 21 Jun 2024 20:57:48 -0400 Subject: [PATCH 2/4] Replace commit hash with correct v7.29.0 release --- internal/code-generator/generator/generator_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/code-generator/generator/generator_test.go b/internal/code-generator/generator/generator_test.go index 101f42d..459f886 100644 --- a/internal/code-generator/generator/generator_test.go +++ b/internal/code-generator/generator/generator_test.go @@ -21,7 +21,7 @@ import ( var ( linguistClonedEnvVar = "ENRY_TEST_REPO" linguistURL = "https://github.com/github/linguist.git" - commit = "b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead" + commit = "4ac734c15a96f9e16fd12330d0cb8de82274f700" samplesDir = "samples" languagesFile = filepath.Join("lib", "linguist", "languages.yml") From 3bcec0ea547dbf2ea515a47f16b2119971529190 Mon Sep 17 00:00:00 2001 From: Martin Leduc <31558169+DecimalTurn@users.noreply.github.com> Date: Fri, 21 Jun 2024 20:59:56 -0400 Subject: [PATCH 3/4] Replace commit hash with correct v7.29.0 release --- internal/code-generator/generator/test_files/alias.gold | 2 +- internal/code-generator/generator/test_files/colors.gold | 2 +- internal/code-generator/generator/test_files/commit.gold | 4 ++-- internal/code-generator/generator/test_files/content.gold | 2 +- .../code-generator/generator/test_files/documentation.gold | 2 +- internal/code-generator/generator/test_files/extension.gold | 2 +- internal/code-generator/generator/test_files/filename.gold | 2 +- internal/code-generator/generator/test_files/frequencies.gold | 2 +- internal/code-generator/generator/test_files/groups.gold | 2 +- internal/code-generator/generator/test_files/interpreter.gold | 2 +- internal/code-generator/generator/test_files/mimeType.gold | 2 +- internal/code-generator/generator/test_files/type.gold | 2 +- internal/code-generator/generator/test_files/vendor.gold | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/code-generator/generator/test_files/alias.gold b/internal/code-generator/generator/test_files/alias.gold index 141ac44..a3b4881 100644 --- a/internal/code-generator/generator/test_files/alias.gold +++ b/internal/code-generator/generator/test_files/alias.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/colors.gold b/internal/code-generator/generator/test_files/colors.gold index 9542c25..9da37dc 100644 --- a/internal/code-generator/generator/test_files/colors.gold +++ b/internal/code-generator/generator/test_files/colors.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/commit.gold b/internal/code-generator/generator/test_files/commit.gold index d78e4f3..bba8c29 100644 --- a/internal/code-generator/generator/test_files/commit.gold +++ b/internal/code-generator/generator/test_files/commit.gold @@ -1,7 +1,7 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data // linguist's commit from which files were generated. -var LinguistCommit = "b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead" +var LinguistCommit = "4ac734c15a96f9e16fd12330d0cb8de82274f700" diff --git a/internal/code-generator/generator/test_files/content.gold b/internal/code-generator/generator/test_files/content.gold index bb2e432..3c6a5c3 100644 --- a/internal/code-generator/generator/test_files/content.gold +++ b/internal/code-generator/generator/test_files/content.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/documentation.gold b/internal/code-generator/generator/test_files/documentation.gold index 82c17a2..5f66f47 100644 --- a/internal/code-generator/generator/test_files/documentation.gold +++ b/internal/code-generator/generator/test_files/documentation.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/extension.gold b/internal/code-generator/generator/test_files/extension.gold index fbd8caf..aa37d31 100644 --- a/internal/code-generator/generator/test_files/extension.gold +++ b/internal/code-generator/generator/test_files/extension.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/filename.gold b/internal/code-generator/generator/test_files/filename.gold index ba409e2..f516749 100644 --- a/internal/code-generator/generator/test_files/filename.gold +++ b/internal/code-generator/generator/test_files/filename.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/frequencies.gold b/internal/code-generator/generator/test_files/frequencies.gold index 4b95858..1e6d24f 100644 --- a/internal/code-generator/generator/test_files/frequencies.gold +++ b/internal/code-generator/generator/test_files/frequencies.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/groups.gold b/internal/code-generator/generator/test_files/groups.gold index e6fb194..da31281 100644 --- a/internal/code-generator/generator/test_files/groups.gold +++ b/internal/code-generator/generator/test_files/groups.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/interpreter.gold b/internal/code-generator/generator/test_files/interpreter.gold index 9e97e35..aa42858 100644 --- a/internal/code-generator/generator/test_files/interpreter.gold +++ b/internal/code-generator/generator/test_files/interpreter.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/mimeType.gold b/internal/code-generator/generator/test_files/mimeType.gold index f9ad316..924c71b 100644 --- a/internal/code-generator/generator/test_files/mimeType.gold +++ b/internal/code-generator/generator/test_files/mimeType.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/type.gold b/internal/code-generator/generator/test_files/type.gold index 61c599e..eeccd10 100644 --- a/internal/code-generator/generator/test_files/type.gold +++ b/internal/code-generator/generator/test_files/type.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data diff --git a/internal/code-generator/generator/test_files/vendor.gold b/internal/code-generator/generator/test_files/vendor.gold index c9bd415..15ea6cd 100644 --- a/internal/code-generator/generator/test_files/vendor.gold +++ b/internal/code-generator/generator/test_files/vendor.gold @@ -1,5 +1,5 @@ // Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. -// Extracted from github/linguist commit: b28dd4b0d5ef6bfaca56f1d34571fddef13e3ead +// Extracted from github/linguist commit: 4ac734c15a96f9e16fd12330d0cb8de82274f700 package data From de4970a14dc88fe7feaa39e11b6bf71adb9fd575 Mon Sep 17 00:00:00 2001 From: Martin Leduc <31558169+DecimalTurn@users.noreply.github.com> Date: Sat, 22 Jun 2024 18:27:55 -0400 Subject: [PATCH 4/4] Remove addition to sync-linguist.yml --- .github/workflows/sync-linguist.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sync-linguist.yml b/.github/workflows/sync-linguist.yml index 2b7177d..fe63451 100644 --- a/.github/workflows/sync-linguist.yml +++ b/.github/workflows/sync-linguist.yml @@ -22,7 +22,6 @@ jobs: set -euo pipefail IFS=$'\n\t' commit=$(sed --quiet --regexp-extended 's/[[:space:]]+commit[[:space:]]+=[[:space:]]"([a-f0-9]{40})"/\1/p' internal/code-generator/generator/generator_test.go) - echo "Previous commit: ${commit::8}" echo "::set-output name=commit::$commit" echo "::set-output name=short_commit::${commit::8}" - uses: actions/checkout@v2