Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6b3612b7366
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 97a983ca21fb
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 29, 2020

  1. do the same in cron workflow

    @garbas
    garbas committed Apr 29, 2020
    Copy the full SHA
    6126f00 View commit details

  2. testing skipping commits [CI Skip]

    @garbas
    garbas committed Apr 29, 2020
    Copy the full SHA
    97a983c View commit details
Showing with 13 additions and 7 deletions.
  1. +11 −5 .github/workflows/cron.yml
  2. +0 −2 .github/workflows/main.yml
  3. +2 −0 update.sh
16 changes: 11 additions & 5 deletions .github/workflows/cron.yml
View file
Original file line number Diff line number Diff line change
@@ -14,13 +14,19 @@ jobs:
- name: Installing Nix
uses: cachix/install-nix-action@v8
- name: Installing NixFlakes
run: nix-env -iA nixpkgs.nixFlakes
- name: Enable Nix Flakes
run: echo 'experimental-features = nix-command flakes' | sudo tee -a /etc/nix/nix.conf && cat /etc/nix/nix.conf
run: |
nix-env -iA nixpkgs.nixFlakes
echo "::add-path::$HOME/.nix-profile/bin"
echo 'experimental-features = nix-command flakes' | sudo tee -a /etc/nix/nix.conf
nix --version
cat /etc/nix/nix.conf
- 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:
@@ -31,7 +37,7 @@ jobs:
production-branch: 'master'
deploy-message: 'Deploy from GitHub Actions'
if: github.repository == 'NixOS/nixos-homepage'
- name: Commit flake.lock and push to master branch
- name: Commit flake.lock, blogs.xml and push to master branch
uses: github-actions-x/commit@v2.5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 0 additions & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,6 @@ jobs:
echo 'experimental-features = nix-command flakes' | sudo tee -a /etc/nix/nix.conf
nix --version
cat /etc/nix/nix.conf
- name: DEBUG 2
run: env && whoami && echo $PATH && which nix && realpath $(which nix)
- name: Update content
run: ./update.sh
- name: Building nixos.org
2 changes: 2 additions & 0 deletions update.sh
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@

set -e

# test

UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going

nix flake update \