Switch testing chanel to nightly (#5)

* feat: add build test * fix: dependencies * fix: duplicate import
UniDash-Linux · Jun 25, 2024 · 10de5d4 · 10de5d4
1 parent cb127aa
commit 10de5d4
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 14 deletions.
diff --git a/.github/workflows/auto_nigthly.yml b/.github/workflows/auto_nigthly.yml
@@ -8,8 +8,12 @@ jobs:
     name: auto create and push release
     runs-on: ubuntu-22.04
     steps:
+      - uses: cachix/install-nix-action@v27
+
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@master
+        with:
+          ref: nightly
 
       - name: Generate Release version from date
         id: date
@@ -21,12 +25,11 @@ jobs:
       - name: Generate tar.gz from src
         id: generate_tar
         run: |
-          cd ./src/
           PKG_NAME="$(basename "${{ github.repository }}" | sed 's/pkg-//g')"
           FILE_NAME="src-${PKG_NAME}.tar.gz"
           echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
           echo "FILE_NAME=$FILE_NAME" >> $GITHUB_ENV
-          tar -czvf ${FILE_NAME} *
+          tar -czvf ${FILE_NAME} src/
           FILE_HASH=$(sha256sum ${FILE_NAME} | cut -d ' ' -f 1)
           echo "FILE_HASH=$FILE_HASH" >> $GITHUB_ENV
 
@@ -38,9 +41,12 @@ jobs:
               | sed 's/\//\\\//g'
           )
           SRC="src = fetchurl {\n    url = \"${URL}\";\n    sha256 = \"${{ env.FILE_HASH }}\";\n  }"
-          sed -i "s/src = .\/src/${SRC}/g" ./package.nix
+          sed -i "s/src = .\/src/src = .\/${{ env.FILE_NAME }}/g" ./package.nix
+          git add ./${{ env.FILE_NAME }}
+          nix build
+          git reset ./${{ env.FILE_NAME }}
+          sed -i "s/src = .\/${{ env.FILE_NAME }}/${SRC}/g" ./package.nix
           sed -i "s/version = \".*\";/version = \"${{ env.TAG_NAME }}\";/g" ./package.nix
-          sed -i "1s/.*/{\n  fetchurl,/" ./package.nix
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
@@ -49,7 +55,7 @@ jobs:
           tag_name: ${{ env.TAG_NAME }}
           prerelease: true
           files: |
-            ./src/${{ env.FILE_NAME }}
+            ./${{ env.FILE_NAME }}
             ./package.nix
 
       - name: Clone RevoluNixPKGS

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
@@ -8,8 +8,10 @@ jobs:
     name: auto create and push release
     runs-on: ubuntu-22.04
     steps:
+      - uses: cachix/install-nix-action@v27
+
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@master
 
       - name: Generate Release version from date
         id: date
@@ -21,12 +23,11 @@ jobs:
       - name: Generate tar.gz from src
         id: generate_tar
         run: |
-          cd ./src/
           PKG_NAME="$(basename "${{ github.repository }}" | sed 's/pkg-//g')"
           FILE_NAME="src-${PKG_NAME}.tar.gz"
           echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
           echo "FILE_NAME=$FILE_NAME" >> $GITHUB_ENV
-          tar -czvf ${FILE_NAME} *
+          tar -czvf ${FILE_NAME} src/
           FILE_HASH=$(sha256sum ${FILE_NAME} | cut -d ' ' -f 1)
           echo "FILE_HASH=$FILE_HASH" >> $GITHUB_ENV
 
@@ -38,9 +39,12 @@ jobs:
               | sed 's/\//\\\//g'
           )
           SRC="src = fetchurl {\n    url = \"${URL}\";\n    sha256 = \"${{ env.FILE_HASH }}\";\n  }"
-          sed -i "s/src = .\/src/${SRC}/g" ./package.nix
+          sed -i "s/src = .\/src/src = .\/${{ env.FILE_NAME }}/g" ./package.nix
+          git add ./${{ env.FILE_NAME }}
+          nix build
+          git reset ./${{ env.FILE_NAME }}
+          sed -i "s/src = .\/${{ env.FILE_NAME }}/${SRC}/g" ./package.nix
           sed -i "s/version = \".*\";/version = \"${{ env.TAG_NAME }}\";/g" ./package.nix
-          sed -i "1s/.*/{\n  fetchurl,/" ./package.nix
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
@@ -49,7 +53,7 @@ jobs:
           tag_name: ${{ env.TAG_NAME }}
           prerelease: false
           files: |
-            ./src/${{ env.FILE_NAME }}
+            ./${{ env.FILE_NAME }}
             ./package.nix
 
       - name: Clone RevoluNixPKGS

diff --git a/.github/workflows/auto_testing.yml b/.github/workflows/auto_testing.yml
@@ -0,0 +1,87 @@
+on:
+  push:
+    branches:
+    - testing
+
+jobs:
+  auto_ralease:
+    name: auto create and push release
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: cachix/install-nix-action@v27
+
+      - name: Checkout repository
+        uses: actions/checkout@master
+        with:
+          ref: testing
+
+      - name: Generate Release version from date
+        id: date
+        run: |
+          TAG_NAME="testing-$(date +'%Y.%m.%d-%H.%M.%S')"
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          echo "Tag name will be: $TAG_NAME"
+      
+      - name: Generate tar.gz from src
+        id: generate_tar
+        run: |
+          PKG_NAME="$(basename "${{ github.repository }}" | sed 's/pkg-//g')"
+          FILE_NAME="src-${PKG_NAME}.tar.gz"
+          echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
+          echo "FILE_NAME=$FILE_NAME" >> $GITHUB_ENV
+          tar -czvf ${FILE_NAME} src/
+          FILE_HASH=$(sha256sum ${FILE_NAME} | cut -d ' ' -f 1)
+          echo "FILE_HASH=$FILE_HASH" >> $GITHUB_ENV
+
+      - name: Generate package.nix
+        id: generate_package
+        run: |
+          URL=$(echo \
+            "https://github.com/${{ github.repository }}/releases/download/${{ env.TAG_NAME }}/${{ env.FILE_NAME }}" \
+              | sed 's/\//\\\//g'
+          )
+          SRC="src = fetchurl {\n    url = \"${URL}\";\n    sha256 = \"${{ env.FILE_HASH }}\";\n  }"
+          sed -i "s/src = .\/src/src = .\/${{ env.FILE_NAME }}/g" ./package.nix
+          git add ./${{ env.FILE_NAME }}
+          nix build
+          git reset ./${{ env.FILE_NAME }}
+          sed -i "s/src = .\/${{ env.FILE_NAME }}/${SRC}/g" ./package.nix
+          sed -i "s/version = \".*\";/version = \"${{ env.TAG_NAME }}\";/g" ./package.nix
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ env.TAG_NAME }}
+          tag_name: ${{ env.TAG_NAME }}
+          prerelease: true
+          files: |
+            ./${{ env.FILE_NAME }}
+            ./package.nix
+
+      - name: Clone RevoluNixPKGS
+        uses: actions/checkout@master
+        with:
+          ref: testing
+          repository: RevoluNix/revolunixpkgs
+          token: ${{ secrets.RevoluNixPKGS_TOKEN }}
+
+      - name: Update RevoluNixPKGS
+        id: update_pkgs
+        run: |
+          git config --global user.email "${{ github.event.pusher.email }}"
+          git config --global user.name "${{ github.event.pusher.name }}"
+          
+          URL="https://github.com/${{ github.repository }}/releases/download/${{ env.TAG_NAME }}/package.nix"
+          rm -rf ./pkgs/${{ env.PKG_NAME }}
+          mkdir -p ./pkgs/${{ env.PKG_NAME }}
+          wget -O ./pkgs/${{ env.PKG_NAME }}/package.nix $URL
+          
+          git add .
+          git commit -m "feat: Update/Upload ${{ env.PKG_NAME }} package"
+          
+      - name: Push RevoluNixPKGS changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.RevoluNixPKGS_TOKEN }}
+          repository: RevoluNix/revolunixpkgs
+          branch: testing
diff --git a/package.nix b/package.nix
@@ -1,4 +1,5 @@
 {
+  fetchurl,
   stdenv,
   lib,
   callPackage,
@@ -46,11 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
   # ----------------------------------------------------------------- #
-  postFixup = ''
+  postFixup = let focus-rofi = fetchurl {
+    url = "https://github.com/RevoluNix/pkg-focus-rofi/releases/download/testing-2024.06.24-09.38.57/package.nix";
+    sha256 = "4360ca6c7ddd2e54126947a00aae82577bdbf74249256b42833bc7ec9c9be941";
+  }; in ''
     wrapProgram $out/bin/${finalAttrs.pname} \
       --prefix PATH : ${lib.makeBinPath [
         rofi-wayland
-        (callPackage ../focus-rofi/package.nix { })
+        (callPackage focus-rofi { })
       ]}
   '';
   # ----------------------------------------------------------------- #