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: 9f8c7830555c
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: cc1b0dacb092
Choose a head ref
  • 13 commits
  • 8 files changed
  • 4 contributors

Commits on Apr 29, 2020

  1. run ./update.sh and commit changed files back to master

    @garbas
    garbas committed Apr 29, 2020
    Copy the full SHA
    8beb284 View commit details

  2. Add Commercial support page 

    includes removed content from previous community page

also removes content that is already on the community page and links to
it instead
    @davidak
    davidak committed Apr 29, 2020
    Copy the full SHA
    4242557 View commit details

Commits on May 2, 2020

  1. Merge pull request #403 from NixOS/update-nixpkgs-on-cron 

    Update flake.lock in cronjob
    @garbas
    garbas authored May 2, 2020
    1
    Copy the full SHA
    2649c0a View commit details

Commits on May 6, 2020

  1. Merge pull request #412 from NixOS/commercial 

    Add Commercial support page
    @garbas
    garbas authored May 6, 2020
    1
    Copy the full SHA
    78e8123 View commit details

Commits on May 11, 2020

  1. Update to use nix shell instead of nix run 

    This was renamed upstream, see NixOS/nix#3551
    @milibopp
    milibopp committed May 11, 2020
    Copy the full SHA
    156a8b8 View commit details

  2. Merge pull request #422 from aepsil0n/fix-update-sh 

    Update to use `nix shell` instead of `nix run`
    @garbas
    garbas authored May 11, 2020
    1
    Copy the full SHA
    3c1792c View commit details

Commits on May 12, 2020

  1. fix commiting to master branch from cron action

    @garbas
    garbas committed May 12, 2020
    Copy the full SHA
    b0092bb View commit details

  2. Merge pull request #423 from NixOS/fix-commiting-to-master 

    Fix commiting to master branch from cron action
    @garbas
    garbas authored May 12, 2020
    1
    Copy the full SHA
    94d4b31 View commit details

  3. fix commiting updates to flake.lock and blogs.xml

    @garbas
    garbas committed May 12, 2020
    Copy the full SHA
    408a6f2 View commit details

  4. Merge pull request #424 from NixOS/fix-commiting-to-master 

    fix commiting updates to flake.lock and blogs.xml
    @garbas
    garbas authored May 12, 2020
    1
    Copy the full SHA
    32ba552 View commit details

  5. Update flake.lock and blogs.xml [ci skip]

    @garbas @actions-user
    garbas authored and actions-user committed May 12, 2020
    Copy the full SHA
    e01be8c View commit details

Commits on May 13, 2020

  1. Merge remote-tracking branch 'origin/master' into landing-page

    @garbas
    garbas committed May 13, 2020
    Copy the full SHA
    e12d9f2 View commit details

  2. Merge branch 'landing-page' of github.com:NixOS/nixos-homepage into l… 

    …anding-page
    @garbas
    garbas committed May 13, 2020
    Copy the full SHA
    cc1b0da View commit details
Showing with 1,025 additions and 981 deletions.
  1. +20 −3 .github/workflows/cron.yml
  2. +12 −1 .github/workflows/main.yml
  3. +2 −2 Makefile
  4. +953 −958 blogs.xml
  5. +22 −0 commercial-support.tt
  6. +6 −6 flake.lock
  7. +4 −9 learn.tt
  8. +6 −2 update.sh
23 changes: 20 additions & 3 deletions .github/workflows/cron.yml
View file
Original file line number Diff line number Diff line change
@@ -3,19 +3,30 @@ 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
with:
fetch-depth: 0
- name: Installing Nix
uses: cachix/install-nix-action@v8
- name: Installing NixFlakes
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:
@@ -26,4 +37,10 @@ jobs:
production-branch: 'master'
deploy-message: 'Deploy from GitHub Actions'
if: github.repository == 'NixOS/nixos-homepage'

- name: Commit flake.lock, blogs.xml and push to master branch
uses: stefanzweifel/git-auto-commit-action@v4.2.0
with:
commit_message: 'Update flake.lock and blogs.xml [ci skip]'
branch: 'master'
file_pattern: flake.lock blogs.xml
if: github.repository == 'NixOS/nixos-homepage'
13 changes: 12 additions & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -7,17 +7,28 @@ 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
with:
fetch-depth: 0
- name: Installing Nix
uses: cachix/install-nix-action@v8
- name: Installing NixFlakes
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:
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst
default: all


HTML = index.html download.html news.html learn.html governance.html \
community.html donate.html \
HTML = index.html download.html news.html learn.html community.html \
governance.html donate.html commercial-support.html \
teams/rfc-steering-committee.html teams/security.html teams/marketing.html \
teams/nixos_release.html teams/infrastructure.html teams/nixcon.html \
teams/discourse.html \
Loading