diff --git a/.github/workflows/Test NSIS.yml b/.github/workflows/Test NSIS.yml deleted file mode 100644 index abee7f1..0000000 --- a/.github/workflows/Test NSIS.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Build NSIS Installer - -on: - # push: - # branches: [ "master" ] - # pull_request: - -jobs: - build-windows: - runs-on: windows-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v6 - - - name: Install NSIS - run: choco install nsis --no-progress -y - - - name: Setup MSVC - uses: microsoft/setup-msbuild@v2 - - - name: Configure project - run: cmake -B build -S . -A x64 - - - name: Build project - run: cmake --build build --config Release - - - name: Generate NSIS installer - run: cd build && cpack -G NSIS - - - name: Upload installer - uses: actions/upload-artifact@v6 - with: - name: clrsync-installer - path: build/*.exe diff --git a/.github/workflows/Test PKGBUILD-git.yml b/.github/workflows/Test PKGBUILD-git.yml index 159e278..619a478 100644 --- a/.github/workflows/Test PKGBUILD-git.yml +++ b/.github/workflows/Test PKGBUILD-git.yml @@ -1,8 +1,8 @@ name: Test PKGBUILD-git on: - # push: - # branch: master + push: + branch: master pull_request: branches: master diff --git a/.github/workflows/Test flake.yml b/.github/workflows/Test flake.yml index 7216fb8..2636a56 100644 --- a/.github/workflows/Test flake.yml +++ b/.github/workflows/Test flake.yml @@ -1,8 +1,8 @@ name: Test flake.nix on: - # push: - # branches: [master] + push: + branches: [master] pull_request: jobs: diff --git a/.github/workflows/Test packages.yml b/.github/workflows/Test packages.yml deleted file mode 100644 index 0d3c8fb..0000000 --- a/.github/workflows/Test packages.yml +++ /dev/null @@ -1,103 +0,0 @@ -name: Test DEB and RPM Packages - -on: - # push: - # branches: - # - master - pull_request: - branches: - - master - -jobs: - test-deb: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y cmake build-essential git \ - libglfw3-dev libfreetype6-dev libfontconfig1-dev \ - libx11-dev libxrandr-dev libxi-dev \ - mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev \ - libxinerama-dev libxcursor-dev libxkbcommon-dev - - - name: Configure CMake - run: | - cmake -B build -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_GLFW=OFF - - - name: Build - run: cmake --build build --config Release - - - name: Package DEB - run: | - cd build - cpack -G DEB - - - name: Install DEB - run: | - sudo dpkg -i build/*.deb || true - sudo apt-get install -f -y - - - name: Test installation - run: | - clrsync_cli --help - dpkg -L $(dpkg -l | grep clrsync | awk '{print $2}') - - - name: Upload DEB artifact - uses: actions/upload-artifact@v4 - with: - name: deb-package - path: build/*.deb - - test-rpm: - runs-on: ubuntu-latest - container: - image: fedora:latest - - steps: - - name: Install dependencies - run: | - dnf install -y cmake gcc gcc-c++ make rpm-build git \ - glfw-devel freetype-devel fontconfig-devel \ - libX11-devel libXrandr-devel libXi-devel \ - mesa-libGL-devel mesa-libGLU-devel \ - libXinerama-devel libXcursor-devel \ - wayland-devel wayland-protocols-devel - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Configure CMake - run: | - cmake -B build -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_GLFW=ON - - - name: Build - run: cmake --build build --config Release - - - name: Package RPM - run: | - cd build - cpack -G RPM - - - name: Install RPM - run: | - dnf install -y build/*.rpm - - - name: Test installation - run: | - clrsync_cli --help - rpm -ql $(rpm -qa | grep clrsync) - - - name: Upload RPM artifact - uses: actions/upload-artifact@v4 - with: - name: rpm-fedora - path: build/*.rpm \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index a14eeb2..5c42a60 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -2,7 +2,8 @@ name: Build and Release Packages on: push: - branches: [ "master" ] + tags: + - 'v*' jobs: build-windows: @@ -130,8 +131,8 @@ jobs: - name: Create Release and Upload Assets uses: ncipollo/release-action@v1 with: - tag: v${{ github.run_number }} - name: Release ${{ github.run_number }} + tag: ${{ github.ref_name }} + name: Release ${{ github.ref_name }} artifacts: | artifacts/*.exe artifacts/*.deb diff --git a/AUR/PKGBUILD b/AUR/PKGBUILD index 914b482..c8af2ca 100644 --- a/AUR/PKGBUILD +++ b/AUR/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Daniel Dada pkgname=clrsync -pkgver=0.1.3 +pkgver=0.1.4 pkgrel=1 pkgdesc="Color scheme manager" arch=('x86_64') diff --git a/CMakeLists.txt b/CMakeLists.txt index 765b69f..1ce3a6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(clrsync VERSION 0.1.3 LANGUAGES CXX) +project(clrsync VERSION 0.1.4 LANGUAGES CXX) include(GNUInstallDirs) diff --git a/package.nix b/package.nix index 3207fc6..1235dea 100644 --- a/package.nix +++ b/package.nix @@ -15,6 +15,7 @@ libxkbcommon, zlib, bzip2, + wayland-scanner, }: stdenv.mkDerivation rec { @@ -23,11 +24,13 @@ stdenv.mkDerivation rec { src = lib.cleanSourceWith { src = ./.; - filter = path: type: + filter = + path: type: let baseName = baseNameOf path; in - ! (lib.hasSuffix ".o" baseName + !( + lib.hasSuffix ".o" baseName || lib.hasSuffix ".a" baseName || baseName == "build" || baseName == "CMakeCache.txt" @@ -57,6 +60,7 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXinerama wayland + wayland-scanner wayland-protocols libxkbcommon zlib @@ -75,7 +79,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/clrsync_gui \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} - + wrapProgram $out/bin/clrsync_cli \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} @@ -90,4 +94,4 @@ stdenv.mkDerivation rec { mainProgram = "clrsync_gui"; maintainers = [ ]; }; -} \ No newline at end of file +} diff --git a/src/core/version.hpp b/src/core/version.hpp index 678e80a..2a64884 100644 --- a/src/core/version.hpp +++ b/src/core/version.hpp @@ -9,7 +9,7 @@ namespace clrsync::core constexpr uint8_t VERSION_MAJOR = 0; constexpr uint8_t VERSION_MINOR = 1; -constexpr uint8_t VERSION_PATCH = 3; +constexpr uint8_t VERSION_PATCH = 4; const std::string version_string(); } // namespace clrsync::core