Merge pull request #96 from e-picsa/ci/build-tests

Ci/build tests

.github/workflows/android-release.yml

@@ -20,24 +20,15 @@ jobs:
   android_release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           lfs: true
           ref: '${{github.event.inputs.build_branch}}'
-      - name: Checkout LFS objects
-        run: git lfs checkout
-      - name: Cache node modules
-        uses: actions/cache@v2
+      - uses: actions/setup-node@v3
         with:
-          path: ./.yarn/cache
-          # If cachebusting required (e.g. breaking yarn changes on update) change `v1` to another number
-          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-v1-
-      - name: Setup node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '16'
+          node-version: '18'
+          cache: 'yarn'
+      - run: yarn install --immutable
       - name: Populate google-services.json
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}

.github/workflows/build-test.yml

@@ -0,0 +1,23 @@
+# Ensure build and tests pass
+
+name: Build Test
+on:
+  pull_request:
+    branches:
+      - main
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          lfs: true
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'yarn'
+      - run: yarn install --immutable
+      # TODO - Ensure tests pass
+      # - run: yarn nx test
+      # Ensure can also build
+      - run: yarn nx build

.github/workflows/web-preview.yml

@@ -14,19 +14,14 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'Test - Preview')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
         with:
-          node-version: 16.x
-      - name: Cache node modules
-        uses: actions/cache@v2
+          lfs: true
+      - uses: actions/setup-node@v3
         with:
-          path: ./.yarn/cache
-          # If cachebusting required (e.g. breaking yarn changes on update) change `v1` to another number
-          key: ${{ runner.os }}-node-modules-yarn-v20221105-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-v20221105-
-      - run: yarn install
+          node-version: '18'
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn nx run picsa-apps-extension-app:build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

.github/workflows/web-release.yml

@@ -15,19 +15,14 @@ jobs:
   web_release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
         with:
-          node-version: 16.x
-      - name: Cache node modules
-        uses: actions/cache@v2
+          lfs: true
+      - uses: actions/setup-node@v3
         with:
-          path: ./.yarn/cache
-          # If cachebusting required (e.g. breaking yarn changes on update) change `v1` to another number
-          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-v1-
-      - run: yarn install
+          node-version: '18'
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn nx run picsa-apps-extension-app:build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

apps/picsa-apps/extension-app-native/android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "io.picsa.extension"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3015000
-        versionName "3.15.0"
+        versionCode 3015001
+        versionName "3.15.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

apps/picsa-apps/extension-app/src/app/data/surveys/index.ts

@@ -1,7 +1,7 @@
 import { fieldVisit } from './field-visit';
 import { registration } from './registration';
-import { test } from './test';
+import { testForm } from './testForm';
 
-const FORMS = [registration, fieldVisit, test];
+const FORMS = [registration, fieldVisit, testForm];
 
 export default FORMS;

apps/picsa-apps/extension-app/src/app/data/surveys/testForm.ts

@@ -0,0 +1,19 @@
+export const testForm = {
+  _key: 'testForm',
+  name: 'Test Form',
+  groups: ['u3EP0KB66MDcD3Ibom0o'],
+  isActive: false,
+  surveyJson: {
+    pages: [
+      {
+        name: 'page1',
+        elements: [
+          {
+            type: 'text',
+            name: 'question1',
+          },
+        ],
+      },
+    ],
+  },
+};

apps/picsa-tools/resources-tool/project.json

@@ -18,7 +18,7 @@
     },
     "preBuild": {
       "executor": "nx:run-commands",
-      "inputs": ["apps/picsa-tools/resources-tool/src/assets/resources/**"],
+      "inputs": ["{projectRoot}/src/assets/resources/**"],
       "outputs": ["{projectRoot}/src/assets/resources/contents.json"],
       "options": {
         "command": "yarn ts-node tools/workflows/populateResourceContents.ts"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "picsa-apps",
-  "version": "3.15.0",
+  "version": "3.15.1",
   "license": "See LICENSE",
   "scripts": {
     "ng": "nx",