From 593f24a2ecf86a2a4db3545a21ff4c75ee526f45 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 18 Jun 2022 01:26:46 +0300 Subject: workflows: add meson version updater and update versions --- .github/workflows/version-update.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/version-update.sh (limited to '.github/workflows') diff --git a/.github/workflows/version-update.sh b/.github/workflows/version-update.sh new file mode 100644 index 00000000..1bf95af9 --- /dev/null +++ b/.github/workflows/version-update.sh @@ -0,0 +1,26 @@ +name: "Nix & Meson: update version" + +on: [push, workflow_dispatch] + +jobs: + update: + runs-on: ubuntu-latest + steps: + - name: Clone repository + uses: actions/checkout@v3 + - name: Update flake and meson version + run: | + REGEX="([0-9]+(\.[0-9a-zA-Z]+)+)" + + CRT_REV=$(git show-ref --tags --head --abbrev | head -n 1 | head -c 7) + TAG_REV=$(git show-ref --tags --abbrev | tail -n 1 | head -c 7) + CRT_VER=$(sed -nEe "/$REGEX/{p;q;}" meson.build | awk -F\' '{print $2}') + VERSION=$(git show-ref --tags --abbrev | tail -n 1 | tail -c +20) + + if [[ $TAG_REV = $CRT_REV ]] || [[ $CRT_VER != $VERSION ]]; then + sed -Ei "s/$REGEX/$VERSION/g" meson.build + sed -Ei "s/$REGEX/$VERSION/g" flake.nix + fi + - uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: "[gha] bump flake and meson version" -- cgit v1.2.3 From ff6e3a4d24cad1442ce7ffc82ba947508bd7ed19 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Wed, 22 Jun 2022 11:51:08 -0700 Subject: T1C: Releases pipeline --- .github/workflows/release.yaml | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/release.yaml (limited to '.github/workflows') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..f548aec2 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,51 @@ +name: Release + +on: + push: + tags: + - "v*.*.*" + +jobs: + meson-rl: + name: "Build and release Hyprland with Meson (Arch)" + runs-on: ubuntu-latest + container: + image: archlinux + steps: + - name: Download dependencies + run: | + sed -i 's/SigLevel = Required DatabaseOptional/SigLevel = Optional TrustAll/' /etc/pacman.conf + pacman --noconfirm --noprogressbar -Syyu + pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd + - name: Checkout Hyprland + uses: actions/checkout@v3 + with: + submodules: true + - name: Configure + run: | + meson obj-x86_64-pc-linux-gnu \ + -Ddefault_library=static + - name: Compile + run: ninja -C obj-x86_64-pc-linux-gnu + - name: Build wlroots + run: | + sed -i '$ d' ./Makefile + make config + - name: Compress and package artifacts + run: | + mkdir x86_64-pc-linux-gnu + mkdir release-files + mkdir release-files/example + mkdir release-files/assets + DESTDIR=$PWD/x86_64-pc-linux-gnu meson install -C obj-x86_64-pc-linux-gnu --tags runtime + cp ./LICENSE release-files/ + cp subprojects/wlroots/build/libwlroots.so.11032 release-files/ + cp x86_64-pc-linux-gnu/usr/local/bin/* release-files/ + cp -r example/ release-files/ + cp -r assets/ release-files/ + tar -cvf Hyprland.tar.xz -C release-files + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: Hyprland.tar.xz -- cgit v1.2.3 From 606f4b07940fe66d072e3dbe899c4ba13e057a99 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 22 Jun 2022 13:09:37 -0700 Subject: Fix release action --- .github/workflows/release.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f548aec2..f58937b4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,7 +7,7 @@ on: jobs: meson-rl: - name: "Build and release Hyprland with Meson (Arch)" + name: "Release Hyprland with Meson (Arch)" runs-on: ubuntu-latest container: image: archlinux @@ -27,10 +27,6 @@ jobs: -Ddefault_library=static - name: Compile run: ninja -C obj-x86_64-pc-linux-gnu - - name: Build wlroots - run: | - sed -i '$ d' ./Makefile - make config - name: Compress and package artifacts run: | mkdir x86_64-pc-linux-gnu @@ -39,11 +35,10 @@ jobs: mkdir release-files/assets DESTDIR=$PWD/x86_64-pc-linux-gnu meson install -C obj-x86_64-pc-linux-gnu --tags runtime cp ./LICENSE release-files/ - cp subprojects/wlroots/build/libwlroots.so.11032 release-files/ cp x86_64-pc-linux-gnu/usr/local/bin/* release-files/ cp -r example/ release-files/ cp -r assets/ release-files/ - tar -cvf Hyprland.tar.xz -C release-files + tar -cvf Hyprland.tar.xz release-files - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') -- cgit v1.2.3 From 6eefd294af1d378c2a28ad65fb326974d8041a39 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 22 Jun 2022 13:18:09 -0700 Subject: Upload release archive --- .github/workflows/release.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f58937b4..39cbf3e5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,8 +39,13 @@ jobs: cp -r example/ release-files/ cp -r assets/ release-files/ tar -cvf Hyprland.tar.xz release-files - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') + - name: Upload release archive + uses: actions/upload-artifact@v3 with: - files: Hyprland.tar.xz + name: Release archive (x86_64-pc-linux-gnu) + path: Hyprland.tar.xz + # - name: Release + # uses: softprops/action-gh-release@v1 + # if: startsWith(github.ref, 'refs/tags/') + # with: + # files: Hyprland.tar.xz -- cgit v1.2.3 From 5614f28dfd11da7f19ed05a63510e65f1afb2f63 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 22 Jun 2022 14:45:48 -0700 Subject: T1C: CMake Release Pipeline (CI) --- .github/workflows/ci.yaml | 48 +++++++++++++++++++++++---------------- .github/workflows/release.yaml | 51 ------------------------------------------ 2 files changed, 29 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/release.yaml (limited to '.github/workflows') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8adef5c4..65320773 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,34 +13,44 @@ jobs: sed -i 's/SigLevel = Required DatabaseOptional/SigLevel = Optional TrustAll/' /etc/pacman.conf pacman --noconfirm --noprogressbar -Syyu pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd - - name: Set up user run: | useradd -m githubuser echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers - - name: Build wlroots run: | su githubuser -c "cd ~ && git clone https://gitlab.freedesktop.org/wlroots/wlroots" su githubuser -c "cd ~/wlroots && meson build/ --prefix=/usr && ninja -C build/ && sudo ninja -C build/ install && cd .." - - name: Fix permissions for git run: | git config --global --add safe.directory /__w/Hyprland/Hyprland - - name: Checkout Hyprland uses: actions/checkout@v3 with: submodules: recursive - - - name: Build Hyprland With default settings + - name: Build Hyprland run: | git submodule sync --recursive && git submodule update --init --force --recursive make all - - - name: Build Hyprland with LEGACY_RENDERER + - name: Compress and package artifacts run: | - make legacyrenderer + mkdir x86_64-pc-linux-gnu + mkdir hyprland + mkdir hyprland/example + mkdir hyprland/assets + cp ./LICENSE hyprland/ + cp build/Hyprland hyprland/ + cp hyprctl/hyprctl hyprland/ + cp subprojects/wlroots/build/libwlroots.so.11032 release-files/ + cp x86_64-pc-linux-gnu/usr/local/bin/* hyprland/ + cp -r example/ hyprland/ + cp -r assets/ hyprland/ + tar -cvf Hyprland.tar.xz hyprland + - name: Release + uses: actions/upload-artifact@v3 + with: + name: Build archive + path: Hyprland.tar.xz meson: name: "Build Hyprland with Meson (Arch)" @@ -63,13 +73,13 @@ jobs: -Ddefault_library=static - name: Compile run: ninja -C obj-x86_64-pc-linux-gnu - - name: Compress artifacts - run: | - mkdir x86_64-pc-linux-gnu - DESTDIR=$PWD/x86_64-pc-linux-gnu meson install -C obj-x86_64-pc-linux-gnu --tags runtime - tar -cvf x86_64-pc-linux-gnu.tar.xz x86_64-pc-linux-gnu - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: Build artifacts (x86_64-pc-linux-gnu) - path: x86_64-pc-linux-gnu.tar.xz +# - name: Compress artifacts +# run: | +# mkdir x86_64-pc-linux-gnu +# DESTDIR=$PWD/x86_64-pc-linux-gnu meson install -C obj-x86_64-pc-linux-gnu --tags runtime +# tar -cvf x86_64-pc-linux-gnu.tar.xz x86_64-pc-linux-gnu +# - name: Upload artifacts +# uses: actions/upload-artifact@v3 +# with: +# name: Build artifacts (x86_64-pc-linux-gnu) +# path: x86_64-pc-linux-gnu.tar.xz diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 39cbf3e5..00000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Release - -on: - push: - tags: - - "v*.*.*" - -jobs: - meson-rl: - name: "Release Hyprland with Meson (Arch)" - runs-on: ubuntu-latest - container: - image: archlinux - steps: - - name: Download dependencies - run: | - sed -i 's/SigLevel = Required DatabaseOptional/SigLevel = Optional TrustAll/' /etc/pacman.conf - pacman --noconfirm --noprogressbar -Syyu - pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd - - name: Checkout Hyprland - uses: actions/checkout@v3 - with: - submodules: true - - name: Configure - run: | - meson obj-x86_64-pc-linux-gnu \ - -Ddefault_library=static - - name: Compile - run: ninja -C obj-x86_64-pc-linux-gnu - - name: Compress and package artifacts - run: | - mkdir x86_64-pc-linux-gnu - mkdir release-files - mkdir release-files/example - mkdir release-files/assets - DESTDIR=$PWD/x86_64-pc-linux-gnu meson install -C obj-x86_64-pc-linux-gnu --tags runtime - cp ./LICENSE release-files/ - cp x86_64-pc-linux-gnu/usr/local/bin/* release-files/ - cp -r example/ release-files/ - cp -r assets/ release-files/ - tar -cvf Hyprland.tar.xz release-files - - name: Upload release archive - uses: actions/upload-artifact@v3 - with: - name: Release archive (x86_64-pc-linux-gnu) - path: Hyprland.tar.xz - # - name: Release - # uses: softprops/action-gh-release@v1 - # if: startsWith(github.ref, 'refs/tags/') - # with: - # files: Hyprland.tar.xz -- cgit v1.2.3 From 2631489a183938b89a5d30bb13232bf2a4b14401 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 22 Jun 2022 15:17:21 -0700 Subject: Syntax error in CI --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65320773..ba8d2874 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: cp ./LICENSE hyprland/ cp build/Hyprland hyprland/ cp hyprctl/hyprctl hyprland/ - cp subprojects/wlroots/build/libwlroots.so.11032 release-files/ + cp subprojects/wlroots/build/libwlroots.so.11032 hyprland/ cp x86_64-pc-linux-gnu/usr/local/bin/* hyprland/ cp -r example/ hyprland/ cp -r assets/ hyprland/ -- cgit v1.2.3 From 64f6818a134057b84eb1aac473567b90a75d75d0 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Wed, 22 Jun 2022 15:22:22 -0700 Subject: :finnadie: https://www.youtube.com/watch?v=_asNhzXq72w --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ba8d2874..77c9c48b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,7 +42,7 @@ jobs: cp build/Hyprland hyprland/ cp hyprctl/hyprctl hyprland/ cp subprojects/wlroots/build/libwlroots.so.11032 hyprland/ - cp x86_64-pc-linux-gnu/usr/local/bin/* hyprland/ + cp build/Hyprland hyprland/ cp -r example/ hyprland/ cp -r assets/ hyprland/ tar -cvf Hyprland.tar.xz hyprland -- cgit v1.2.3