diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 0416acc..8193215 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +github: KSXGitHub # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] patreon: khai96_ open_collective: # Collective unavailable ko_fi: # Replace with a single Ko-fi username diff --git a/Dockerfile b/Dockerfile index a93e49f..f1416de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM archlinux:base RUN pacman -Syu --noconfirm RUN pacman -S --noconfirm --needed --overwrite '*' \ - openssh sudo \ + openssh sudo base-devel \ git fakeroot binutils gcc awk binutils xz \ libarchive bzip2 coreutils file findutils \ gettext grep gzip sed ncurses util-linux \ diff --git a/README.md b/README.md index 90c7fbc..e3acfb0 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Glob patterns will be expanded by bash when copying the files to the repository. ### `allow_empty_commits` -**Optional** Allow empty commits, i.e. commits with no change. The default value is `true`. +**Optional** Allow empty commits, i.e. commits with no change. The default value is `false`. ### `force_push` @@ -77,6 +77,9 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Generate PKGBUILD + run: bash ./generate-pkgbuild.bash + - name: Publish AUR package uses: KSXGitHub/github-actions-deploy-aur@ with: @@ -86,7 +89,7 @@ jobs: commit_email: ${{ secrets.AUR_EMAIL }} ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} commit_message: Update AUR package - ssh_keyscan_types: rsa,dsa,ecdsa,ed25519 + ssh_keyscan_types: rsa,ecdsa,ed25519 ``` **Note:** Replace `` in the above code snippet with a tag of this repo. diff --git a/action.yml b/action.yml index 3bb8ce4..5f5a0bd 100644 --- a/action.yml +++ b/action.yml @@ -47,7 +47,7 @@ inputs: allow_empty_commits: description: 'Allow empty commits, i.e. commits with no change.' required: false - default: 'true' + default: 'false' force_push: description: 'Use --force when push to the AUR.' required: false diff --git a/build.sh b/build.sh index 334f319..34063f6 100755 --- a/build.sh +++ b/build.sh @@ -64,13 +64,13 @@ echo '::endgroup::' echo '::group::Copying files into /tmp/local-repo' { echo "Copying $pkgbuild" - cp -r "$pkgbuild" /tmp/local-repo/ + cp -v "$pkgbuild" /tmp/local-repo/PKGBUILD } # shellcheck disable=SC2086 # Ignore quote rule because we need to expand glob patterns to copy $assets if [[ -n "$assets" ]]; then echo 'Copying' $assets - cp -rt /tmp/local-repo/ $assets + cp -rvt /tmp/local-repo/ $assets fi echo '::endgroup::'