Merge pull request #60 from dcelasun/feat/replace-paru-with-yay
feat: Replace paru with yay
This commit is contained in:
@@ -26,14 +26,14 @@ jobs:
|
||||
|
||||
- name: Get sample package
|
||||
run: |
|
||||
# Spotify 1:1.2.63.394-1
|
||||
# Spotify 1:1.2.77.358-1
|
||||
mkdir spotify
|
||||
pushd spotify
|
||||
wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/PKGBUILD
|
||||
wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/.SRCINFO
|
||||
wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/LICENSE
|
||||
wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/spotify.protocol
|
||||
wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/spotify.sh
|
||||
wget https://github.com/christian-heusel/aur/raw/3d22bb1890fb41b709b8e3991816455a0b508b77/spotify/PKGBUILD
|
||||
wget https://github.com/christian-heusel/aur/raw/3d22bb1890fb41b709b8e3991816455a0b508b77/spotify/.SRCINFO
|
||||
wget https://github.com/christian-heusel/aur/raw/3d22bb1890fb41b709b8e3991816455a0b508b77/spotify/LICENSE
|
||||
wget https://github.com/christian-heusel/aur/raw/3d22bb1890fb41b709b8e3991816455a0b508b77/spotify/spotify.protocol
|
||||
wget https://github.com/christian-heusel/aur/raw/3d22bb1890fb41b709b8e3991816455a0b508b77/spotify/spotify.sh
|
||||
popd
|
||||
- name: Running test
|
||||
uses: ./
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
updpkgsums: true
|
||||
srcinfo: true
|
||||
path: 'spotify'
|
||||
pgpkeys: 'C85668DF69375001'
|
||||
pgpkeys: '5384CE82BA52C83A'
|
||||
|
||||
- name: Show diff
|
||||
run: |
|
||||
|
||||
+3
-3
@@ -10,9 +10,9 @@ RUN useradd -m builder && \
|
||||
WORKDIR /home/builder
|
||||
USER builder
|
||||
|
||||
# Install paru
|
||||
RUN git clone https://aur.archlinux.org/paru-bin.git
|
||||
RUN cd paru-bin && makepkg -si --noconfirm
|
||||
# Install yay
|
||||
RUN git clone https://aur.archlinux.org/yay-bin.git
|
||||
RUN cd yay-bin && makepkg -si --noconfirm
|
||||
|
||||
# Copy files
|
||||
COPY LICENSE README.md /
|
||||
|
||||
@@ -30,7 +30,7 @@ Following inputs can be used as `step.with` keys
|
||||
| `srcinfo` | Boolean | `false` | `false` | Generate new .SRCINFO |
|
||||
| `namcap` | Boolean | `true` | `false` | Validate PKGBUILD |
|
||||
| `flags` | String | `-cfs --noconfirm` | `false` | Flags after `makepkg` command. Leave this empty will disable this command. |
|
||||
| `aur` | Boolean | `false` | `false` | Resolve dependencies using paru |
|
||||
| `aur` | Boolean | `false` | `false` | Resolve dependencies using yay |
|
||||
| `update_archlinux_keyring` | Boolean | `true` | `false` | Update the archlinux keyring |
|
||||
| `pgpkeys` | String | | `false` | Comma-separated PGP public keys to be loaded before calling makepkg. |
|
||||
| `pgpkeyserver` | String | `hkps://keyserver.ubuntu.com` | `false` | PGP key server address. |
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ inputs:
|
||||
default: 'true'
|
||||
required: false
|
||||
aur:
|
||||
description: 'Resolve dependencies using paru'
|
||||
description: 'Resolve dependencies using yay'
|
||||
default: 'false'
|
||||
required: false
|
||||
archlinux_keyring:
|
||||
|
||||
+3
-3
@@ -76,11 +76,11 @@ if [[ $INPUT_NAMCAP == true ]]; then
|
||||
echo "::endgroup::"
|
||||
fi
|
||||
|
||||
# Install depends using paru from aur
|
||||
# Install depends using yay from aur
|
||||
if [[ $INPUT_AUR == true ]]; then
|
||||
echo "::group::Installing depends using paru"
|
||||
echo "::group::Installing depends using yay"
|
||||
source PKGBUILD
|
||||
paru -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"
|
||||
yay -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"
|
||||
echo "::endgroup::"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user