Commit 0e35ca28 authored by Jacob Priddy's avatar Jacob Priddy 👌
Browse files

Merge branch '59-separate-front-back-end-build-processes' into 'master'

Resolve "Separate front/back end build processes"

Closes #59

See merge request !46
parents 0c3e6b41 d0133e64
Pipeline #8848 passed with stages
in 2 minutes and 54 seconds
......@@ -14,8 +14,7 @@ stages:
build_web_backend:
stage: build
script:
- cd src/web
- ./install-dev.sh
- src/web/backend/install-dev.sh
artifacts:
paths:
- src/web/backend/vendor
......@@ -24,6 +23,11 @@ build_web_backend:
# Currently set to build timeout
expire_in: 1 hour
build_web_frontend:
stage: build
script:
- src/web/frontend/install-dev.sh
test_php_styles:
stage: test
script:
......
#!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# Install php dependencies
composer install -d "${DIR}"
# configure the backend
"${DIR}/configure.sh"
......@@ -61,7 +61,7 @@ class DoorAccessTest extends AuthenticatesWithApplicationTestCase
// Just add an open mode schedule, we test the actual auth logic elsewhere.
// Here we are testing integration with the route
$date = Carbon::now('America/Los_Angeles');
$dateString = $date->format('Ymd') . 'T' . $date->format('Gis');
$dateString = $date->format('Ymd') . 'T' . $date->format('His');
$t = <<<RSET
DTSTART;TZID=America/Los_Angeles:$dateString
RRULE:FREQ=MINUTELY;INTERVAL=2;COUNT=3
......
......@@ -23,7 +23,7 @@ class RecurrenceSetLibraryConnectorTest extends TestCase
{
parent::setUp();
$this->begin = Carbon::parse('2020-05-17 17:49:10', 'America/Los_Angeles');
$this->beginString = $this->begin->format('Ymd') . 'T' . $this->begin->format('Gis');
$this->beginString = $this->begin->format('Ymd') . 'T' . $this->begin->format('His');
$this->setRepository = new PhpRruleRecurrenceSet();
}
......
#!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
npm install --prefix "${DIR}"
npm run --prefix "${DIR}" build
......@@ -2,9 +2,5 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# Install php dependencies
composer install -d "${DIR}/backend"
# configure the backend
"${DIR}/backend/configure.sh"
npm install --prefix "${DIR}/frontend"
npm run --prefix "${DIR}/frontend" build
\ No newline at end of file
"${DIR}/backend/install-dev.sh"
"${DIR}/frontend/install-dev.sh"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment