From 78f0ffb5e3a12429d29d1a4434e630f557dd4df1 Mon Sep 17 00:00:00 2001 From: mrjones-plip Date: Fri, 4 Sep 2020 16:30:43 -0700 Subject: [PATCH 1/6] fail on bad builds in CI earlier #299 --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c26b0ba06..4212d3f7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,10 @@ jobs: hugo-version: "0.71.1" extended: true + # Run "build" to catch errors as early as possible in CI + - name: All Branches - Build Hugo + run: hugo + # Pinning to current version as of Aug 3, 2020 for stability - name: All Branches - Install Go v1.14 uses: actions/setup-go@v2 From 7cf9301d67652344eede0c3c9ab3f895ee823a8b Mon Sep 17 00:00:00 2001 From: mrjones-plip Date: Fri, 4 Sep 2020 16:33:49 -0700 Subject: [PATCH 2/6] move requirments up so we can safely run hugo --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4212d3f7f..d5899677f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,8 +28,15 @@ jobs: hugo-version: "0.71.1" extended: true + - name: All Branches - Install npm modules for Hugo + if: ${{github.ref == 'refs/heads/master' }} + run: | + npm install + npm install -g postcss-cli + npm i -D autoprefixer + # Run "build" to catch errors as early as possible in CI - - name: All Branches - Build Hugo + - name: All Branches - Test For Broken Builds in Hugo run: hugo # Pinning to current version as of Aug 3, 2020 for stability @@ -58,13 +65,6 @@ jobs: with: node-version: '12.x' - - name: Master Branch Only - Install npm modules for hugo build - if: ${{github.ref == 'refs/heads/master' }} - run: | - npm install - npm install -g postcss-cli - npm i -D autoprefixer - - name: Master Branch Only - Build for prod with minify if: github.ref == 'refs/heads/master' run: env HUGO_ENV="production" hugo --minify From a9942585f0e4870ce8ad3e418ce8977c1e4b7398 Mon Sep 17 00:00:00 2001 From: mrjones-plip Date: Fri, 4 Sep 2020 16:34:20 -0700 Subject: [PATCH 3/6] remove checks for master for all branches --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5899677f..e0852e58b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: extended: true - name: All Branches - Install npm modules for Hugo - if: ${{github.ref == 'refs/heads/master' }} run: | npm install npm install -g postcss-cli From dafd8473465470a2a267fe3eaa8fac2732da743c Mon Sep 17 00:00:00 2001 From: mrjones-plip Date: Fri, 4 Sep 2020 16:36:32 -0700 Subject: [PATCH 4/6] remove checks for master for all branches for node --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0852e58b..49c7796d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,11 @@ jobs: hugo-version: "0.71.1" extended: true + - name: All Branches - Install Node 12.x + uses: actions/setup-node@v1 + with: + node-version: '12.x' + - name: All Branches - Install npm modules for Hugo run: | npm install @@ -58,12 +63,6 @@ jobs: shell: bash run: ./.github/scripts/muffet.sh - - name: Master Branch Only - Install Node 12.x - if: ${{ github.ref == 'refs/heads/master' }} - uses: actions/setup-node@v1 - with: - node-version: '12.x' - - name: Master Branch Only - Build for prod with minify if: github.ref == 'refs/heads/master' run: env HUGO_ENV="production" hugo --minify From e0b585a14d50b9edfe5ef03e6e224aa200d71263 Mon Sep 17 00:00:00 2001 From: mrjones-plip Date: Fri, 4 Sep 2020 16:43:04 -0700 Subject: [PATCH 5/6] intentionally break build to ensure CI build breaks too --- content/en/apps/concepts/users.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/en/apps/concepts/users.md b/content/en/apps/concepts/users.md index 361d0129c..37ec35b25 100644 --- a/content/en/apps/concepts/users.md +++ b/content/en/apps/concepts/users.md @@ -8,7 +8,7 @@ relatedContent: > design/personas apps/tutorials/contact-and-users-1 apps/tutorials/contact-and-users-2 - core/guides/users-bulk-load + core/guides/users-bulk-loadddd --- Apps built with the Core Framework use roles and permissions to determine who has access to what data. User roles are general categories you can use to assign a collection of broad permissions to users. There are two classes of roles: online and offline. Generally speaking, CHWs are usually offline users, while managers and nurses are usually online users. SMS users do not use the app, and thus do not have a user role. @@ -24,7 +24,9 @@ Differing levels of access and permissions are assigned to each persona. A user | CHWs | Logs in at CHW Area level | Phone | Users at this level have online and offline access to view households and family members, submit reports about them, and view tasks and targets about them. | | Family members | Registered at Household level, does not log in | Messaging | Family members might include fathers, mothers, children, and other adults. The program model determines which family members should be registered in the app. However, they are not users of the app, and do not log in themselves. | -{{< see-also page="apps/reference/app-settings/user-roles" anchor="" title="Defining User Roles" >}} +{{< see-also page="apps/reference/app-settings/user-roles/" anchor="" title="Defining User Roles" >}} + +[foo]({{< relref "barfdsfs/bash" >}}) ### Online Users From 72467025462dc6bb85695dd85135f5c6b3dc7d2d Mon Sep 17 00:00:00 2001 From: mrjones-plip Date: Fri, 4 Sep 2020 16:51:36 -0700 Subject: [PATCH 6/6] revert build to be good again --- content/en/apps/concepts/users.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/content/en/apps/concepts/users.md b/content/en/apps/concepts/users.md index 37ec35b25..361d0129c 100644 --- a/content/en/apps/concepts/users.md +++ b/content/en/apps/concepts/users.md @@ -8,7 +8,7 @@ relatedContent: > design/personas apps/tutorials/contact-and-users-1 apps/tutorials/contact-and-users-2 - core/guides/users-bulk-loadddd + core/guides/users-bulk-load --- Apps built with the Core Framework use roles and permissions to determine who has access to what data. User roles are general categories you can use to assign a collection of broad permissions to users. There are two classes of roles: online and offline. Generally speaking, CHWs are usually offline users, while managers and nurses are usually online users. SMS users do not use the app, and thus do not have a user role. @@ -24,9 +24,7 @@ Differing levels of access and permissions are assigned to each persona. A user | CHWs | Logs in at CHW Area level | Phone | Users at this level have online and offline access to view households and family members, submit reports about them, and view tasks and targets about them. | | Family members | Registered at Household level, does not log in | Messaging | Family members might include fathers, mothers, children, and other adults. The program model determines which family members should be registered in the app. However, they are not users of the app, and do not log in themselves. | -{{< see-also page="apps/reference/app-settings/user-roles/" anchor="" title="Defining User Roles" >}} - -[foo]({{< relref "barfdsfs/bash" >}}) +{{< see-also page="apps/reference/app-settings/user-roles" anchor="" title="Defining User Roles" >}} ### Online Users