From b58a0193d03dd0d08ee9ef40b8d022f65cc3e604 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:04:37 +0300 Subject: [PATCH 1/8] GitHub CI: main: upd name: add GHC for GitHub CI to not mix-in GHCJS M .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 116d5324..570bf762 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: "Nixpkgs, Linux" +name: "Nixpkgs, GHC, Linux" on: # On Git changes in PR pull_request: From a5dd7a5704e7f4b2e608185db25d786da9696bd1 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:06:18 +0300 Subject: [PATCH 2/8] GitHub CI: workflow: mv (main->Nixpkgs-GHC-Linux).yml R .github/workflows/main.yml -> .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/{main.yml => Nixpkgs-GHC-Linux.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{main.yml => Nixpkgs-GHC-Linux.yml} (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/Nixpkgs-GHC-Linux.yml From 544bcb1901efd3040097f13db098315adba4dc42 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:12:49 +0300 Subject: [PATCH 3/8] GitHub CI: workflow: mv Quality build M .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/Nixpkgs-GHC-Linux.yml | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Nixpkgs-GHC-Linux.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml index 570bf762..b436abb1 100644 --- a/.github/workflows/Nixpkgs-GHC-Linux.yml +++ b/.github/workflows/Nixpkgs-GHC-Linux.yml @@ -63,12 +63,20 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh - build20: - name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)" + build40: + name: "Quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1" runs-on: ubuntu-latest continue-on-error: true env: - buildStrictly: "true" + compiler: "ghc8101" + buildFromSdist: "true" + linkWithGold: "true" + doHaddock: "true" + doHyperlinkSource: "true" + doBenchmark: "true" + disableOptimization: "false" + enableDeadCodeElimination: "true" + generateOptparseApplicativeCompletions: "false" steps: - name: Git checkout uses: actions/checkout@v2 @@ -76,12 +84,12 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh - build30: - name: "NixOS 20.03 stable channel, default GHC (8.8.3)" + build20: + name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)" runs-on: ubuntu-latest continue-on-error: true env: - rev: "nixos-20.03" + buildStrictly: "true" steps: - name: Git checkout uses: actions/checkout@v2 @@ -89,20 +97,12 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh - build40: - name: "Quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1" + build30: + name: "NixOS 20.03 stable channel, default GHC (8.8.3)" runs-on: ubuntu-latest continue-on-error: true env: - compiler: "ghc8101" - buildFromSdist: "true" - linkWithGold: "true" - doHaddock: "true" - doHyperlinkSource: "true" - doBenchmark: "true" - disableOptimization: "false" - enableDeadCodeElimination: "true" - generateOptparseApplicativeCompletions: "false" + rev: "nixos-20.03" steps: - name: Git checkout uses: actions/checkout@v2 From 4d890c82b7488f6496bc19600c87e475062dcfcf Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:14:00 +0300 Subject: [PATCH 4/8] GitHub CI: workflow: m rname builds M .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/Nixpkgs-GHC-Linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Nixpkgs-GHC-Linux.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml index b436abb1..0d92a5bf 100644 --- a/.github/workflows/Nixpkgs-GHC-Linux.yml +++ b/.github/workflows/Nixpkgs-GHC-Linux.yml @@ -63,7 +63,7 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh - build40: + build20: name: "Quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1" runs-on: ubuntu-latest continue-on-error: true @@ -84,7 +84,7 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh - build20: + build30: name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)" runs-on: ubuntu-latest continue-on-error: true @@ -97,7 +97,7 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh - build30: + build40: name: "NixOS 20.03 stable channel, default GHC (8.8.3)" runs-on: ubuntu-latest continue-on-error: true From 8d4e33007df1816d43c7bde5f645eee4ae914b9c Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:25:28 +0300 Subject: [PATCH 5/8] GitHub CI: workflow: m rename of the build M .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/Nixpkgs-GHC-Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Nixpkgs-GHC-Linux.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml index 0d92a5bf..e9eddadd 100644 --- a/.github/workflows/Nixpkgs-GHC-Linux.yml +++ b/.github/workflows/Nixpkgs-GHC-Linux.yml @@ -64,7 +64,7 @@ jobs: - name: Determined nix-build run: ./build.sh build20: - name: "Quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1" + name: "Release-quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1, Nix shell" runs-on: ubuntu-latest continue-on-error: true env: From 740680ddadd00276fd868ec0950d59a15232639a Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:26:23 +0300 Subject: [PATCH 6/8] GitHub CI: workflow: Quality build: add nix-shell test M .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/Nixpkgs-GHC-Linux.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Nixpkgs-GHC-Linux.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml index e9eddadd..a8dd052a 100644 --- a/.github/workflows/Nixpkgs-GHC-Linux.yml +++ b/.github/workflows/Nixpkgs-GHC-Linux.yml @@ -84,6 +84,8 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh + - name: Test Nix-shell + run: nix-shell --command "echo Succesfully evaluated, loaded and entered $IN_NIX_SHELL Nix shell env." build30: name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)" runs-on: ubuntu-latest From 65ba89bedaa03a2b9197c0dcf651e7958f4b4e3d Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 18:29:40 +0300 Subject: [PATCH 7/8] GitHub CI: workflow: add denotation towards main examples M .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/Nixpkgs-GHC-Linux.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/Nixpkgs-GHC-Linux.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml index a8dd052a..cce52e20 100644 --- a/.github/workflows/Nixpkgs-GHC-Linux.yml +++ b/.github/workflows/Nixpkgs-GHC-Linux.yml @@ -50,6 +50,8 @@ env: executableNamesToShellComplete: '[ "replaceWithExecutableName" ]' jobs: + + # Basic example build10: name: "Nixpkgs-unstable channel, default GHC (8.8.3)" runs-on: ubuntu-latest @@ -63,6 +65,9 @@ jobs: uses: cachix/install-nix-action@v10 - name: Determined nix-build run: ./build.sh + + + # Example of customization using Nixpkgs Haskell Lib API build20: name: "Release-quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1, Nix shell" runs-on: ubuntu-latest @@ -86,6 +91,8 @@ jobs: run: ./build.sh - name: Test Nix-shell run: nix-shell --command "echo Succesfully evaluated, loaded and entered $IN_NIX_SHELL Nix shell env." + + # Other samples of tests used in the project build30: name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)" runs-on: ubuntu-latest From 63d1e1607693e89eb502c0d1f741a7238fe9a2a2 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 7 Jul 2020 19:00:16 +0300 Subject: [PATCH 8/8] GitHub CI: workflow: Quality build: fx nix-shell command M .github/workflows/Nixpkgs-GHC-Linux.yml --- .github/workflows/Nixpkgs-GHC-Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Nixpkgs-GHC-Linux.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml index cce52e20..30974ee8 100644 --- a/.github/workflows/Nixpkgs-GHC-Linux.yml +++ b/.github/workflows/Nixpkgs-GHC-Linux.yml @@ -90,7 +90,7 @@ jobs: - name: Determined nix-build run: ./build.sh - name: Test Nix-shell - run: nix-shell --command "echo Succesfully evaluated, loaded and entered $IN_NIX_SHELL Nix shell env." + run: nix-shell --command 'echo Succesfully evaluated, loaded and entered $IN_NIX_SHELL Nix shell env.' # Other samples of tests used in the project build30: