From d839ee813db9ec0f005976b3ba5a2bdd1eb02686 Mon Sep 17 00:00:00 2001 From: Heptazhou Date: Sun, 24 Nov 2024 12:44:54 +0000 Subject: [PATCH] Update --- .github/packages/7-zip-full/version.txt | 2 +- .github/workflows/make-7-zip-full.yml | 4 ++-- .github/workflows/make-iraf-bin.yml | 2 +- .github/workflows/make-libcurl-julia-bin.yml | 2 +- .github/workflows/make-nsis.yml | 2 +- .github/workflows/make-wine64.yml | 2 +- .github/workflows/make-yay.yml | 2 +- .github/workflows/repo-sync.yml | 12 ++++++++++++ .github/workflows/repo-updt.yml | 2 +- workflows.jl | 7 ++++--- 10 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/packages/7-zip-full/version.txt b/.github/packages/7-zip-full/version.txt index 0fd5a6f..55786ef 100644 --- a/.github/packages/7-zip-full/version.txt +++ b/.github/packages/7-zip-full/version.txt @@ -1 +1 @@ -7-zip-full-v24.08-1 +7-zip-full-v24.09-1 diff --git a/.github/workflows/make-7-zip-full.yml b/.github/workflows/make-7-zip-full.yml index 8134fc4..182273c 100644 --- a/.github/workflows/make-7-zip-full.yml +++ b/.github/workflows/make-7-zip-full.yml @@ -17,7 +17,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init @@ -46,6 +46,6 @@ jobs: gh release delete $GH_TAG --cleanup-tag -y || true gh release create $GH_TAG *.pkg.tar.zst --target `cat head` && cat head env: - GH_TAG: 7-zip-full-v24.08-1 + GH_TAG: 7-zip-full-v24.09-1 GH_REPO: ${{ github.repository }} GH_TOKEN: ${{ secrets.PAT }} diff --git a/.github/workflows/make-iraf-bin.yml b/.github/workflows/make-iraf-bin.yml index 3d93961..378b866 100644 --- a/.github/workflows/make-iraf-bin.yml +++ b/.github/workflows/make-iraf-bin.yml @@ -17,7 +17,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init diff --git a/.github/workflows/make-libcurl-julia-bin.yml b/.github/workflows/make-libcurl-julia-bin.yml index a4b12de..5142797 100644 --- a/.github/workflows/make-libcurl-julia-bin.yml +++ b/.github/workflows/make-libcurl-julia-bin.yml @@ -17,7 +17,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init diff --git a/.github/workflows/make-nsis.yml b/.github/workflows/make-nsis.yml index 9148152..2545f0d 100644 --- a/.github/workflows/make-nsis.yml +++ b/.github/workflows/make-nsis.yml @@ -17,7 +17,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init diff --git a/.github/workflows/make-wine64.yml b/.github/workflows/make-wine64.yml index 6f9a95f..2ff274a 100644 --- a/.github/workflows/make-wine64.yml +++ b/.github/workflows/make-wine64.yml @@ -17,7 +17,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init diff --git a/.github/workflows/make-yay.yml b/.github/workflows/make-yay.yml index 796c3af..2526e1c 100644 --- a/.github/workflows/make-yay.yml +++ b/.github/workflows/make-yay.yml @@ -17,7 +17,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 329633b..bbcb2d1 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -117,6 +117,18 @@ jobs: source_branch: master destination_branch: nsis github_token: ${{ secrets.PAT }} + python312: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - uses: heptazhou/github-sync@v2.3.0 + with: + source_repo: https://aur.archlinux.org/python312.git + source_branch: master + destination_branch: python312 + github_token: ${{ secrets.PAT }} wine-wow64: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/repo-updt.yml b/.github/workflows/repo-updt.yml index ea72274..31da990 100644 --- a/.github/workflows/repo-updt.yml +++ b/.github/workflows/repo-updt.yml @@ -19,7 +19,7 @@ jobs: echo -e 'Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch' >> mirrorlist echo -e 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> mirrorlist tac mirrorlist > mirrorlist~ && mv mirrorlist{~,} && cd /etc - sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -17 -M1024M --long)/' -i makepkg.conf + sed -r 's/^(COMPRESSZST)=.*/\1=(zstdmt -18 -M1024M --long)/' -i makepkg.conf sed -r 's/^#(MAKEFLAGS)=.*/\1="-j`nproc`"/' -i makepkg.conf sed -r 's/^#(PACKAGER)=.*/\1="Seele "/' -i makepkg.conf pacman-key --init diff --git a/workflows.jl b/workflows.jl index d2c4327..18ae110 100644 --- a/workflows.jl +++ b/workflows.jl @@ -1,4 +1,4 @@ -# Copyright (C) 2022-2024 Heptazhou +# Copyright (C) 2022-2025 Heptazhou # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -16,7 +16,7 @@ using Exts using TOML: TOML using YAML: yaml -const COMPRESS = "zstdmt -17 -M1024M --long" +const COMPRESS = "zstdmt -18 -M1024M --long" const NAME, MAIL = "Seele", "seele@0h7z.com" const PACKAGER = "$NAME <$MAIL>" const PUSH_NOP = "Everything up-to-date" @@ -247,7 +247,7 @@ end # https://aur.archlinux.org/packages const pkg = LDict( # [depends..., pkgbase] => (sync, make, pkgver_pkgrel), - ["7-zip-full"] => (1, 1, "24.08-1"), + ["7-zip-full"] => (1, 1, "24.09-1"), ["apt-zsh-completion"] => (1, 0, "5.9-1"), ["conda-zsh-completion"] => (1, 0, "0.11-1"), ["glibc-linux4"] => (1, 0, "2.38-1"), @@ -255,6 +255,7 @@ const pkg = LDict( ["libcurl-julia-bin"] => (1, 1, "1.11-1"), ["locale-mul_zz"] => (1, 0, "2.0-3"), ["mingw-w64-zlib", "nsis"] => (1, 1, "3.10-1"), + ["python312"] => (1, 0, "3.12.8-1"), ["wine-wow64"] => (1, 0, "9.21-1"), ["wine64"] => (0, 1, "9.21-1"), ["xgterm-bin"] => (1, 0, "2.2rc1-3"),