From 78ee7fbe2691c7e7ea05c92d286dc643f83e3f4b Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Mon, 30 Sep 2024 14:30:57 +0200
Subject: [PATCH] Use julia nightly for static compilation CI (#64)

---
 .github/workflows/Compile.yml         | 12 ++----------
 juliac/rpath-private-libs-macos.patch | 16 ----------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 juliac/rpath-private-libs-macos.patch

diff --git a/.github/workflows/Compile.yml b/.github/workflows/Compile.yml
index 00f332e..5612295 100644
--- a/.github/workflows/Compile.yml
+++ b/.github/workflows/Compile.yml
@@ -21,17 +21,9 @@ jobs:
           - macOS-latest
     steps:
       - uses: actions/checkout@v4
-      # - uses: julia-actions/setup-julia@v2
-      #   with:
-      #     version: 'nightly'
-      - uses: julia-actions/install-juliaup@v2
+      - uses: julia-actions/setup-julia@v2
         with:
-          channel: 'pr55047' # https://github.com/JuliaLang/julia/pull/55047
-      - name: Patch julia-config.jl
-        run: |
-          juliaconfig=$(julia -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR,"julia", "julia-config.jl"))')
-          patch -p1 "${juliaconfig}" juliac/rpath-private-libs-macos.patch
-        if: ${{ matrix.os == 'macOS-latest' }}
+          version: 'nightly'
       - uses: julia-actions/cache@v2
       - name: Compile Runic with juliac
         run: |
diff --git a/juliac/rpath-private-libs-macos.patch b/juliac/rpath-private-libs-macos.patch
deleted file mode 100644
index f5c5e85..0000000
--- a/juliac/rpath-private-libs-macos.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl
-index 55996e9fe5..8725b08eba 100755
---- a/contrib/julia-config.jl
-+++ b/contrib/julia-config.jl
-@@ -67,8 +67,9 @@ function ldlibs(doframework)
-         "julia"
-     end
-     if Sys.isunix()
--        return "-L$(shell_escape(private_libDir())) " *  "-Wl,-rpath,$(shell_escape(libDir())) " *
--            (Sys.isapple() ? string() : "-Wl,-rpath,$(shell_escape(private_libDir())) ") *
-+        return "-L$(shell_escape(private_libDir())) " *
-+            "-Wl,-rpath,$(shell_escape(libDir())) " *
-+            "-Wl,-rpath,$(shell_escape(private_libDir())) " *
-             "-l$libname"
-     else
-         return "-l$libname -lopenlibm"