manual conflict resolution 2022-09-07

gromgit · Sep 7, 2022 · b0dee0b · b0dee0b
2 parents 16eed59 + 9ecebe8
commit b0dee0b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/Formula/gitlab-runner.rb b/Formula/gitlab-runner.rb
@@ -35,7 +35,7 @@ def install
   service do
     run [opt_bin/"gitlab-runner", "run", "--syslog"]
     environment_variables PATH: std_service_path_env
-    working_dir Dir.home
+    working_dir ENV["HOME"]
     keep_alive true
     macos_legacy_timers true
     process_type :interactive

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -45,15 +45,15 @@ class OpensslAT11 < Formula
     end
   end
 
-  # Fix failing test due to expired certificates.
-  # Remove with the next version (1.1.1p).
-  patch do
-    url "https://github.com/openssl/openssl/commit/73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch?full_index=1"
-    sha256 "4b04ce0b7a3132c640bdc7726c7efaeb28572c5b8cdffcdc80fea700ded964e3"
-  end
-  patch do
-    url "https://github.com/openssl/openssl/commit/b7ce611887cfac633aacc052b2e71a7f195418b8.patch?full_index=1"
-    sha256 "6a81f4b2edb9ca3d56d897b4c85faac59fb488434dae6f0b5c525e9f96c879df"
+   # Fix failing test due to expired certificates.
+   # Remove with the next version (1.1.1p).
+   patch do
+     url "https://github.com/openssl/openssl/commit/73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch?full_index=1"
+     sha256 "4b04ce0b7a3132c640bdc7726c7efaeb28572c5b8cdffcdc80fea700ded964e3"
+   end
+   patch do
+     url "https://github.com/openssl/openssl/commit/b7ce611887cfac633aacc052b2e71a7f195418b8.patch?full_index=1"
+     sha256 "6a81f4b2edb9ca3d56d897b4c85faac59fb488434dae6f0b5c525e9f96c879df"
   end
 
   # SSLv2 died with 1.1.0, so no-ssl2 no longer required.

diff --git a/Formula/picat.rb b/Formula/picat.rb
@@ -12,9 +12,7 @@ class Picat < Formula
   end
 
   bottle do
-    # root_url "https://github.com/gromgit/homebrew-core-aarch64_linux/releases/download/picat"
-    root_url "https://ghcr.io/v2/gromgit/core-aarch64_linux/picat"
-    sha256 cellar: :any_skip_relocation, aarch64_linux: "1f8cf0ccf6a2cf908967ab7c75255f2943849d087404808c0c6cb241f70e00db"
+    sha256 aarch64_linux: "45492fb95de6a5adad25722737543da5f5b1b1b0a26c1816138fb9b43673ab37" # fake aarch64_linux
   end
 
   def install