diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 2b1d9e9..3c0cebb 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -25,7 +25,7 @@ jobs: - name: Set workspace as safe run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Generate build matrix @@ -52,7 +52,7 @@ jobs: - name: Cache buildroot id: br-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /var/cache key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }} diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 0000000..def840d --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,53 @@ +name: Update +on: + schedule: + - cron: "0 * * * *" + workflow_dispatch: + +jobs: + autoupdate: + runs-on: ubuntu-latest + container: + image: ghcr.io/terrapkg/builder:frawhide + options: --cap-add=SYS_ADMIN --privileged + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} + + - name: Install SSH signing key & Set up git repository + run: | + mkdir -p ${{ runner.temp }} + echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key + chmod 0700 ${{ runner.temp }}/signing_key + git config --global --add safe.directory "$GITHUB_WORKSPACE" + + - name: Run Update + run: anda update -vv + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RUST_BACKTRACE: full + + - name: Save + run: | + if [[ `git status --porcelain` ]]; then + git config user.name "Raboneko" + git config user.email "raboneko@fyralabs.com" + git config gpg.format "ssh" + git config user.signingkey "${{ runner.temp }}/signing_key" + msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" + git commit -S -a -m "$msg" + copy_over () { + git format-patch HEAD^ + git checkout $1 + git apply *.patch || true + rm *.patch + git add * + git commit -S -a -m "$msg" + } + copy_over um39 || true + copy_over um40 || true + git push -u origin --all + fi diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index f0cc85f..7457fa5 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -45,7 +45,7 @@ Summary: Ultramarine Linux release files Name: ultramarine-release Version: %{dist_version} -Release: 10%{?dist} +Release: 11%{?dist} License: MIT Source0: LICENSE URL: https://ultramarine-linux.org @@ -828,7 +828,7 @@ sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Atomic XFCE/;s///; install -d %{buildroot}%{_datadir}/dnf/plugins cat >> %{buildroot}%{_datadir}/dnf/plugins/copr.vendor.conf << EOF [main] -distribution = Fedora +distribution = fedora releasever = %{releasever} EOF