Merge pull request #641 from github/dependabot/github_actions/actions…

…/setup-go-4 Bump actions/setup-go from 3 to 4
github · Mar 17, 2023 · d1dd11c · d1dd11c
2 parents da2eaaa + e6a7efa
commit d1dd11c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -145,7 +145,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go }}
     - name: Set up Ruby
@@ -169,7 +169,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go }}
         cache: true

diff --git a/.licenses/bundler/octokit.dep.yml b/.licenses/bundler/octokit.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: octokit
-version: 4.25.1
+version: 6.1.0
 type: bundler
 summary: Ruby toolkit for working with the GitHub API
 homepage: https://github.com/octokit/octokit.rb

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,17 +14,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.2)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     byebug (11.1.3)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     dotenv (2.8.1)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
@@ -46,7 +45,7 @@ GEM
     nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.25.1)
+    octokit (6.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     parallel (1.22.1)
@@ -55,7 +54,7 @@ GEM
     pathname-common_prefix (0.0.1)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (3.0.4.2)
+    rack (3.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.6.2)
@@ -97,7 +96,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
-    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

diff --git a/lib/licensed/configuration.rb b/lib/licensed/configuration.rb
@@ -116,7 +116,7 @@ def allow(license)
     # Returns an array of paths to files containing additional license terms.
     def additional_terms_for_dependency(dependency)
       amendment_paths = Array(self.dig("additional_terms", dependency["type"], dependency["name"]))
-      amendment_paths.flat_map { |path| Dir.glob(self.root.join(path)) }
+      amendment_paths.flat_map { |path| Dir.glob(self.root.join(path)) }.sort
     end
 
     private