From ced81b1f76d8c5c0b4a1bc8abd774fdd088c1f7b Mon Sep 17 00:00:00 2001 From: Heptazhou Date: Thu, 28 Mar 2024 01:29:07 +0000 Subject: [PATCH] Update --- .github/workflows/make-libcurl-julia-bin.yml | 31 ++++++++++++++++++++ .github/workflows/make-nsis.yml | 3 +- libcurl-julia-bin/.SRCINFO | 3 ++ libcurl-julia-bin/PKGBUILD | 2 +- workflows.jl | 22 +++++++++----- 5 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/make-libcurl-julia-bin.yml diff --git a/.github/workflows/make-libcurl-julia-bin.yml b/.github/workflows/make-libcurl-julia-bin.yml new file mode 100644 index 0000000..801072e --- /dev/null +++ b/.github/workflows/make-libcurl-julia-bin.yml @@ -0,0 +1,31 @@ +on: + workflow_dispatch: ~ + push: + branches: + - "libcurl-julia-bin" + +jobs: + makepkg: + container: archlinux:base-devel + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + path: libcurl-julia-bin + ref: libcurl-julia-bin + - run: pacman-key --init + - run: pacman -Syu --noconfirm dbus-daemon-units + - run: |- + makepkg -V + echo 'PACKAGER="Heptazhou "' >> /etc/makepkg.conf + sed -re 's/\b(EUID) == 0\b/\1 < -0/g' -i /bin/makepkg + - run: |- + cd libcurl-julia-bin + makepkg -si --noconfirm + mv -vt .. *.pkg.tar.zst + - run: ls -lav *.pkg.tar.zst + - uses: actions/upload-artifact@v4 + with: + compression-level: 0 + path: "*.pkg.tar.zst" diff --git a/.github/workflows/make-nsis.yml b/.github/workflows/make-nsis.yml index e44abcd..be85e60 100644 --- a/.github/workflows/make-nsis.yml +++ b/.github/workflows/make-nsis.yml @@ -23,7 +23,8 @@ jobs: - run: pacman -Syu --noconfirm dbus-daemon-units - run: |- makepkg -V - sed -re 's/\b(EUID) == 0\b/\1 < 0/g' -i /bin/makepkg + echo 'PACKAGER="Heptazhou "' >> /etc/makepkg.conf + sed -re 's/\b(EUID) == 0\b/\1 < -0/g' -i /bin/makepkg - run: |- cd mingw-w64-zlib makepkg -si --noconfirm diff --git a/libcurl-julia-bin/.SRCINFO b/libcurl-julia-bin/.SRCINFO index 9c0580e..707d360 100644 --- a/libcurl-julia-bin/.SRCINFO +++ b/libcurl-julia-bin/.SRCINFO @@ -8,6 +8,9 @@ pkgbase = libcurl-julia-bin depends = julia provides = libcurl-julia conflicts = libcurl-julia + conflicts = julia-bin + conflicts = julia-beta-bin + conflicts = julia-nightly-bin options = !debug source = https://julialang-s3.julialang.org/bin/linux/x64/1.10/julia-1.10-latest-linux-x86_64.tar.gz source = libcurl-julia-update.hook diff --git a/libcurl-julia-bin/PKGBUILD b/libcurl-julia-bin/PKGBUILD index 85dac20..ce090cc 100644 --- a/libcurl-julia-bin/PKGBUILD +++ b/libcurl-julia-bin/PKGBUILD @@ -9,7 +9,7 @@ arch=("x86_64") url="https://julialang.org/" license=("MIT") provides=("$pkgname_") -conflicts=("$pkgname_") +conflicts=("$pkgname_" julia{,-{beta,nightly}}-bin) depends=("julia") options=(!debug) source_="julia-$pkgver-latest-linux-x86_64.tar.gz" diff --git a/workflows.jl b/workflows.jl index acb2987..d91d61b 100644 --- a/workflows.jl +++ b/workflows.jl @@ -57,13 +57,13 @@ const MAKEPKG(pkgbases::Vector{String}) = ODict( S"pacman -Syu --noconfirm dbus-daemon-units" """ makepkg -V - sed -re 's/$(s"\b(EUID) == 0\b/\1 < 0")/g' -i /bin/\ - makepkg""" + echo 'PACKAGER="Heptazhou "' >> /etc/makepkg.conf + sed -re 's/$(s"\b(EUID) == 0\b/\1 < -0")/g' -i /bin/makepkg""" map(pkgbase -> strip(""" cd $pkgbase makepkg -si --noconfirm mv -vt .. *.pkg.tar.zst - """), pkgbases) + """), pkgbases)... S"ls -lav *.pkg.tar.zst" ] ACT_ARTIFACT("*.pkg.tar.zst") @@ -92,6 +92,17 @@ write(".github/workflows/repo-sync.yml", ), ) +# https://aur.archlinux.org/packages/libcurl-julia-bin +write(".github/workflows/make-libcurl-julia-bin.yml", + yaml( + S"on" => ODict( + S"workflow_dispatch" => nothing, + S"push" => ODict(S"branches" => ["libcurl-julia-bin"]), + ), + S"jobs" => MAKEPKG(["libcurl-julia-bin"]), + ), +) + # https://aur.archlinux.org/packages/nsis write(".github/workflows/make-nsis.yml", yaml( @@ -99,10 +110,7 @@ write(".github/workflows/make-nsis.yml", S"workflow_dispatch" => nothing, S"push" => ODict(S"branches" => ["nsis"]), ), - S"jobs" => MAKEPKG([ - "mingw-w64-zlib" - "nsis" - ]), + S"jobs" => MAKEPKG(["mingw-w64-zlib", "nsis"]), ), )