Updated build scripts

Co-authored-by: Erik Reider <35975961+ErikReider@users.noreply.github.com>
2022-11-14 17:12:43 +01:00 · 2022-11-14 17:12:43 +01:00 · ffaab52752
parent 6c1a3ec2f7
commit ffaab52752
6 changed files with 92 additions and 53 deletions
--- a/.github/workflows/AUR_publish.yml
+++ b/.github/workflows/AUR_publish.yml
@ -7,48 +7,56 @@ on:
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
 jobs:
-  aur-publish:
+  aur-publish-stable:
    runs-on: ubuntu-latest
    steps:
-    - name: Check out sources
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    # Checks out the latest tag
-    - run: |
-        git stash save "Action stashing changes"
-        latestTag=$(git describe --abbrev=0 --tags)
-        git checkout $latestTag
+      - name: Check out sources
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      # Checks out the latest tag
+      - run: |
+          git stash save "Action stashing changes"
+          latestTag=$(git describe --abbrev=0 --tags)
+          git checkout $latestTag

-    - name: Publish AUR Stable package
-      uses: ulises-jeremias/github-actions-aur-publish@v1
-      with:
-        pkgname: swayfx
-        pkgbuild: ./build-scripts/aur/PKGBUILD
-        assets: |
-          ./build-scripts/aur/50-systemd-user.conf
-          ./build-scripts/aur/sway.install
-        commit_username: ${{ secrets.AUR_USERNAME }}
-        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
-        update_pkgver: false
+      - name: Publish AUR Stable package
+        uses: ulises-jeremias/github-actions-aur-publish@v1
+        with:
+          pkgname: swayfx
+          pkgbuild: ./build-scripts/aur/PKGBUILD
+          assets: |
+            ./build-scripts/aur/50-systemd-user.conf
+            ./build-scripts/aur/sway.install
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          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
+          update_pkgver: false

-    # Checks out the the Master branch
-    - run: |
-        git checkout master
-    - name: Publish AUR -git package
-      uses: ulises-jeremias/github-actions-aur-publish@v1
-      with:
-        pkgname: swayfx-git
-        pkgbuild: ./build-scripts/aur-git/PKGBUILD
-        assets: |
-          ./build-scripts/aur-git/50-systemd-user.conf
-          ./build-scripts/aur-git/sway.install
-        commit_username: ${{ secrets.AUR_USERNAME }}
-        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
-        update_pkgver: false
+  aur-publish-git:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out sources
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      # Checks out the the Master branch
+      - run: |
+          git checkout master
+
+      - name: Publish AUR -git package
+        uses: ulises-jeremias/github-actions-aur-publish@v1
+        with:
+          pkgname: swayfx-git
+          pkgbuild: ./build-scripts/aur-git/PKGBUILD
+          assets: |
+            ./build-scripts/aur-git/50-systemd-user.conf
+            ./build-scripts/aur-git/sway.install
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          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
+          update_pkgver: false
--- a/.github/workflows/arch-build-git.yml
+++ b/.github/workflows/arch-build-git.yml
@ -1,4 +1,4 @@
-name: Check build for Arch.
+name: Check git build for Arch.

 on:
  push:
@ -10,7 +10,7 @@ on:
  workflow_dispatch:

 jobs:
-  arch-build:
+  arch-build-git:
    container: archlinux:latest
    runs-on: ubuntu-latest

@ -27,9 +27,3 @@ jobs:
        uses: edlanglois/pkgbuild-action@v1
        with:
          pkgdir: ./swayfx/build-scripts/aur-git
-
-      - name: Stable makepkg build and check
-        id: makepkg
-        uses: edlanglois/pkgbuild-action@v1
-        with:
-          pkgdir: ./swayfx/build-scripts/aur
--- a/.github/workflows/arch-build-stable.yml
+++ b/.github/workflows/arch-build-stable.yml
@ -0,0 +1,29 @@
+name: Check stable build for Arch.
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  arch-build-stable:
+    container: archlinux:latest
+    runs-on: ubuntu-latest
+
+    steps:
+      # It is necessary to checkout into sub-directory, because of some weird ownership problems cause by using containers
+      - name: Check out sources
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          path: swayfx
+
+      - name: Stable makepkg build and check
+        id: makepkg
+        uses: edlanglois/pkgbuild-action@v1
+        with:
+          pkgdir: ./swayfx/build-scripts/aur
--- a/.github/workflows/fedora-copr.yml
+++ b/.github/workflows/fedora-copr.yml
@ -16,10 +16,17 @@ jobs:
      - name: Install API token for copr-cli
        env:
          # To generate a new token: https://copr.fedorainfracloud.org/api/.
+          API_LOGIN: ${{ secrets.COPR_API_LOGIN }}
+          API_USERNAME: ${{ secrets.COPR_API_USERNAME }}
          API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}
        run: |
          mkdir -p "$HOME/.config"
-          echo "$API_TOKEN_CONTENT" > "$HOME/.config/copr"
+          # To generate a new token: https://copr.fedorainfracloud.org/api/.
+          echo "[copr-cli]" >> "$HOME/.config/copr"
+          echo "login = $API_LOGIN" >> "$HOME/.config/copr"
+          echo "username = $API_USERNAME" >> "$HOME/.config/copr"
+          echo "token = $API_TOKEN_CONTENT" >> "$HOME/.config/copr"
+          echo "copr_url = https://copr.fedorainfracloud.org" >> "$HOME/.config/copr"

      - name: Install tooling for source RPM build
        run: |
--- a/.gitignore
+++ b/.gitignore
@ -8,6 +8,7 @@ test/
 build/
 build-*/
 !build-scripts
+!build-scripts/*
 .lvimrc
 config-debug
 wayland-*-protocol.*
--- a/build-scripts/aur/PKGBUILD
+++ b/build-scripts/aur/PKGBUILD
@ -42,7 +42,7 @@ optdepends=(
 backup=(etc/sway/config)
 arch=("i686" "x86_64")
 url="https://github.com/WillPower3309/swayfx"
-source=("${url}/releases/download/$pkgver/swayfx-$pkgver.tar.gz"
+source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz"
 	50-systemd-user.conf)
 sha512sums=(
 	"SKIP"
@ -56,7 +56,7 @@ build() {
 	arch-meson \
 		-Dsd-bus-provider=libsystemd \
 		-Dwerror=false \
-		"$_pkgname" build
+		"${_pkgname}-${pkgver}" build
 	meson compile -C build
 }

@ -65,7 +65,7 @@ package() {

 	DESTDIR="$pkgdir" meson install -C build

-	cd "$_pkgname"
+	cd "${_pkgname}-${pkgver}"
 	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	for util in autoname-workspaces.py inactive-windows-transparency.py grimshot; do
 		install -Dm755 "contrib/$util" -t "$pkgdir/usr/share/$pkgname/scripts"