Merge a382ce5 into 895319d

NixOS · Apr 21, 2020 · 2cc7f4b · 2cc7f4b · github-actions · Apr 21, 2020
2 parents 895319d + a382ce5
commit 2cc7f4b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -3,8 +3,9 @@ on:
   schedule:
   - cron: '0 * * * *'
 jobs:
-  build-and-deploy:
+  hourly-build-and-deploy:
     runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[CI Skip]')"
     steps:
     - name: Checking out the repository
       uses: actions/checkout@v2

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[CI Skip]')"
     steps:
     - name: Checking out the repository
       uses: actions/checkout@v2
@@ -17,7 +18,7 @@ jobs:
     - name: Update content
       run: ./update.sh
     - name: Building nixos.org
-      run: nix-build && mkdir build && cp -RL ./result/* ./build/
+      run: nix build && mkdir build && cp -RL ./result/* ./build/
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.0.5
       env:
@@ -29,3 +30,11 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         deploy-message: 'Deploy from GitHub Actions'
       if: github.repository == 'NixOS/nixos-homepage'
+    - name: Commit flake.lock and push to master branch
+      uses: github-actions-x/commit@v2.5
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        push-branch: 'test'
+        commit-message: 'Update flake.lock [CI Skip]'
+        force-add: 'true'
+        files: flake.lock
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -26,12 +26,12 @@
 
       nixPills = import nix-pills {
         inherit pkgs;
-        revCount = nix-pills.lastModifiedDate; # FIXME
+        revCount = nix-pills.lastModified; # FIXME
         shortRev = nix-pills.shortRev;
       };
 
       homepage = stdenv.mkDerivation {
-        name = "nixos-homepage-${self.lastModifiedDate}";
+        name = "nixos-homepage-${builtins.toString self.lastModified}";
 
         src = self;
 

diff --git a/update.sh b/update.sh
@@ -2,4 +2,4 @@
 
 UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going || true
 
-nix flake update --update-input released-nixpkgs || true
+nix flake update --recreate-lock-file || true