From 889dcc2c11cad5892e884ece1dac62f319e6468b Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 09:03:14 -0700 Subject: [PATCH 01/14] split into new folders --- cypress/e2e/ui/{standard => events}/standard.calendar.spec.js | 0 cypress/e2e/ui/{standard => events}/standard.events.spec.js | 0 cypress/e2e/ui/{standard => groups}/standard.group.spec.js | 0 cypress/e2e/ui/{standard => groups}/standard.sundayschool.spec.js | 0 cypress/e2e/ui/{standard => people}/standard.family.spec.js | 0 cypress/e2e/ui/{standard => people}/standard.members.del.spec.js | 0 cypress/e2e/ui/{standard => people}/standard.person.list.spec.js | 0 cypress/e2e/ui/{standard => people}/standard.person.new.spec.js | 0 cypress/e2e/ui/{standard => reports}/standard.reports.spec.js | 0 cypress/e2e/ui/{standard => user}/standard.user.password.spec.js | 0 cypress/e2e/ui/{standard => user}/standard.user.settings.spec.js | 0 cypress/e2e/ui/{standard => user}/standard.user.spec.js | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename cypress/e2e/ui/{standard => events}/standard.calendar.spec.js (100%) rename cypress/e2e/ui/{standard => events}/standard.events.spec.js (100%) rename cypress/e2e/ui/{standard => groups}/standard.group.spec.js (100%) rename cypress/e2e/ui/{standard => groups}/standard.sundayschool.spec.js (100%) rename cypress/e2e/ui/{standard => people}/standard.family.spec.js (100%) rename cypress/e2e/ui/{standard => people}/standard.members.del.spec.js (100%) rename cypress/e2e/ui/{standard => people}/standard.person.list.spec.js (100%) rename cypress/e2e/ui/{standard => people}/standard.person.new.spec.js (100%) rename cypress/e2e/ui/{standard => reports}/standard.reports.spec.js (100%) rename cypress/e2e/ui/{standard => user}/standard.user.password.spec.js (100%) rename cypress/e2e/ui/{standard => user}/standard.user.settings.spec.js (100%) rename cypress/e2e/ui/{standard => user}/standard.user.spec.js (100%) diff --git a/cypress/e2e/ui/standard/standard.calendar.spec.js b/cypress/e2e/ui/events/standard.calendar.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.calendar.spec.js rename to cypress/e2e/ui/events/standard.calendar.spec.js diff --git a/cypress/e2e/ui/standard/standard.events.spec.js b/cypress/e2e/ui/events/standard.events.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.events.spec.js rename to cypress/e2e/ui/events/standard.events.spec.js diff --git a/cypress/e2e/ui/standard/standard.group.spec.js b/cypress/e2e/ui/groups/standard.group.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.group.spec.js rename to cypress/e2e/ui/groups/standard.group.spec.js diff --git a/cypress/e2e/ui/standard/standard.sundayschool.spec.js b/cypress/e2e/ui/groups/standard.sundayschool.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.sundayschool.spec.js rename to cypress/e2e/ui/groups/standard.sundayschool.spec.js diff --git a/cypress/e2e/ui/standard/standard.family.spec.js b/cypress/e2e/ui/people/standard.family.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.family.spec.js rename to cypress/e2e/ui/people/standard.family.spec.js diff --git a/cypress/e2e/ui/standard/standard.members.del.spec.js b/cypress/e2e/ui/people/standard.members.del.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.members.del.spec.js rename to cypress/e2e/ui/people/standard.members.del.spec.js diff --git a/cypress/e2e/ui/standard/standard.person.list.spec.js b/cypress/e2e/ui/people/standard.person.list.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.person.list.spec.js rename to cypress/e2e/ui/people/standard.person.list.spec.js diff --git a/cypress/e2e/ui/standard/standard.person.new.spec.js b/cypress/e2e/ui/people/standard.person.new.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.person.new.spec.js rename to cypress/e2e/ui/people/standard.person.new.spec.js diff --git a/cypress/e2e/ui/standard/standard.reports.spec.js b/cypress/e2e/ui/reports/standard.reports.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.reports.spec.js rename to cypress/e2e/ui/reports/standard.reports.spec.js diff --git a/cypress/e2e/ui/standard/standard.user.password.spec.js b/cypress/e2e/ui/user/standard.user.password.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.user.password.spec.js rename to cypress/e2e/ui/user/standard.user.password.spec.js diff --git a/cypress/e2e/ui/standard/standard.user.settings.spec.js b/cypress/e2e/ui/user/standard.user.settings.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.user.settings.spec.js rename to cypress/e2e/ui/user/standard.user.settings.spec.js diff --git a/cypress/e2e/ui/standard/standard.user.spec.js b/cypress/e2e/ui/user/standard.user.spec.js similarity index 100% rename from cypress/e2e/ui/standard/standard.user.spec.js rename to cypress/e2e/ui/user/standard.user.spec.js From 945c521c972a1a3b41c428782c07e9098a25cb85 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 09:51:22 -0700 Subject: [PATCH 02/14] reverted back change to photo expires logic --- src/ChurchCRM/utils/MiscUtils.php | 2 -- src/api/routes/people/people-family.php | 8 ++++---- src/api/routes/people/people-person.php | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/ChurchCRM/utils/MiscUtils.php b/src/ChurchCRM/utils/MiscUtils.php index 3322320b3b..392f1eb355 100644 --- a/src/ChurchCRM/utils/MiscUtils.php +++ b/src/ChurchCRM/utils/MiscUtils.php @@ -58,8 +58,6 @@ public static function getRandomCache($baseCacheTime,$variability){ public static function getPhotoCacheExpirationTimestamp() { $cacheLength = SystemConfig::getValue("iPhotoClientCacheDuration"); $cacheLength = MiscUtils::getRandomCache($cacheLength,0.5*$cacheLength); - //echo time() + $cacheLength; - //die(); return time() + $cacheLength ; } diff --git a/src/api/routes/people/people-family.php b/src/api/routes/people/people-family.php index d739148c6a..ac4aaa3d73 100644 --- a/src/api/routes/people/people-family.php +++ b/src/api/routes/people/people-family.php @@ -15,9 +15,9 @@ $app->group('/family/{familyId:[0-9]+}', function () use ($app) { $app->get('/photo', function ($request, $response, $args) use ($app) { - $res = $app->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); + $this->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); $photo = new Photo("Family", $args['familyId']); - return $res->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType()); + return $response->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType()); }); $app->post('/photo', function ($request, $response, $args) { @@ -33,9 +33,9 @@ })->add(new EditRecordsRoleAuthMiddleware()); $app->get('/thumbnail', function ($request, $response, $args) use ($app) { - $res = $app->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); + $this->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); $photo = new Photo("Family", $args['familyId']); - return $res->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType()); + return $response->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType()); }); $app->get('', function ($request, $response, $args) { diff --git a/src/api/routes/people/people-person.php b/src/api/routes/people/people-person.php index 9873df3e12..bb1776e4ab 100644 --- a/src/api/routes/people/people-person.php +++ b/src/api/routes/people/people-person.php @@ -14,27 +14,27 @@ // This group does not load the person via middleware (to speed up the page loads) $app->group('/person/{personId:[0-9]+}', function () use ($app) { - $app->get('/thumbnail', function ($request, $response, $args) use ($app) { - $res = $app->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); + $app->get('/thumbnail', function (Request $request, Response $response, array $args) use ($app) { + $this->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); $photo = new Photo("Person", $args['personId']); - return $res->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType()); + return $response->write($photo->getThumbnailBytes())->withHeader('Content-type', $photo->getThumbnailContentType()); }); - $app->get('/photo', function ($request, $response, $args) use ($app) { - $res = $app->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); + $app->get('/photo', function (Request $request, Response $response, array $args) use ($app) { + $this->cache->withExpires($response, MiscUtils::getPhotoCacheExpirationTimestamp()); $photo = new Photo("Person", $args['personId']); - return $res->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType()); + return $response->write($photo->getPhotoBytes())->withHeader('Content-type', $photo->getPhotoContentType()); }); }); $app->group('/person/{personId:[0-9]+}', function () use ($app) { - $app->get('', function ($request, $response, $args) { + $app->get('', function (Request $request, Response $response, array $args) { $person = $request->getAttribute("person"); return $response->withHeader('Content-Type', 'application/json')->write($person->exportTo('JSON')); }); - $app->delete('', function ($request, $response, $args) { + $app->delete('', function (Request $request, Response $response, array $args) { $person = $request->getAttribute("person"); if (AuthenticationManager::GetCurrentUser()->getId() == $person->getId()) { return $response->withStatus(403, gettext("Can't delete yourself")); @@ -45,18 +45,18 @@ $app->post('/role/{roleId:[0-9]+}', 'setPersonRoleAPI')->add(new EditRecordsRoleAuthMiddleware()); - $app->post('/addToCart', function ($request, $response, $args) { + $app->post('/addToCart', function (Request $request, Response $response, array $args) { Cart::AddPerson($args['personId']); }); - $app->post('/photo', function ($request, $response, $args) { + $app->post('/photo', function (Request $request, Response $response, array $args) { $person = $request->getAttribute("person"); $input = (object)$request->getParsedBody(); $person->setImageFromBase64($input->imgBase64); $response->withJson(["status" => "success"]); })->add(new EditRecordsRoleAuthMiddleware()); - $app->delete('/photo', function ($request, $response, $args) { + $app->delete('/photo', function (Request $request, Response $response, array $args) { $person = $request->getAttribute("person"); return $response->withJson(['success' => $person->deletePhoto()]); })->add(new DeleteRecordRoleAuthMiddleware()); From 568e7f15e7876e17ad25ab46bc62a118af8bac8b Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:13:00 -0700 Subject: [PATCH 03/14] updated the file with version # --- .github/workflows/package-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml index 20791bc03a..d2d6743b13 100644 --- a/.github/workflows/package-build.yml +++ b/.github/workflows/package-build.yml @@ -27,6 +27,10 @@ jobs: # setting a registry enables the NODE_AUTH_TOKEN env variable where we can set an npm token. REQUIRED registry-url: 'https://registry.npmjs.org' + - name: get-npm-version + id: package-version + uses: martinbeentjes/npm-get-version-action@master + - name: Install & Build Source run: npm run deploy @@ -35,5 +39,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: ChurchCRM + name: ChurchCRM-${{ steps.package-version.outputs.current-version}} path: target/ChurchCRM-*.zip \ No newline at end of file From 85e3df31ad9e54e959deab521e885ce51979ce2b Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:14:36 -0700 Subject: [PATCH 04/14] added ${{ github.sha }} to file name --- .github/workflows/package-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml index d2d6743b13..8b7dcb297d 100644 --- a/.github/workflows/package-build.yml +++ b/.github/workflows/package-build.yml @@ -39,5 +39,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: ChurchCRM-${{ steps.package-version.outputs.current-version}} + name: ChurchCRM-${{ steps.package-version.outputs.current-version}}-${{ github.sha }}.zip path: target/ChurchCRM-*.zip \ No newline at end of file From 4566371dcb216d31dcdb85395f89fffc85981cde Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:19:06 -0700 Subject: [PATCH 05/14] Ensure we have the .zip in the filename --- .github/workflows/package-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml index 8b7dcb297d..8e315acbbd 100644 --- a/.github/workflows/package-build.yml +++ b/.github/workflows/package-build.yml @@ -39,5 +39,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: ChurchCRM-${{ steps.package-version.outputs.current-version}}-${{ github.sha }}.zip + name: ChurchCRM-${{ steps.package-version.outputs.current-version}}.zip path: target/ChurchCRM-*.zip \ No newline at end of file From 1f485e9518c8d26ea4dde95f33c0d3e81418a254 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:19:54 -0700 Subject: [PATCH 06/14] Only run on Sat. --- .github/workflows/build-audit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-audit.yml b/.github/workflows/build-audit.yml index 35e4a82da4..ecf076b71f 100644 --- a/.github/workflows/build-audit.yml +++ b/.github/workflows/build-audit.yml @@ -2,9 +2,6 @@ name: Audit 3rd Party Libs on: - push: - branches: - - 'master' schedule: - cron: '0 9 * * 6' From b984cf2f3b5c20ea37145241e2097740a831e530 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:20:23 -0700 Subject: [PATCH 07/14] Updated to latest npm and checkout action --- .github/workflows/build-audit.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-audit.yml b/.github/workflows/build-audit.yml index ecf076b71f..9f71aef742 100644 --- a/.github/workflows/build-audit.yml +++ b/.github/workflows/build-audit.yml @@ -11,15 +11,19 @@ env: jobs: audit: runs-on: ubuntu-latest + strategy: + matrix: + node-version: ['20.x'] steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4 with: # fetch full history so things like auto-changelog work properly fetch-depth: 0 - - name: Use Node.js ${{ env.node_version }} - uses: actions/setup-node@v2-beta + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 with: - node-version: ${{ env.node_version }} + node-version: ${{ matrix.node-version }} + cache: 'npm' # setting a registry enables the NODE_AUTH_TOKEN env variable where we can set an npm token. REQUIRED registry-url: 'https://registry.npmjs.org' From 161e8b27bbadaea7159c860c6c6e49cbb98707ab Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:21:53 -0700 Subject: [PATCH 08/14] running on node 20 --- .github/workflows/build-audit.yml | 3 --- .github/workflows/package-build.yml | 3 --- .github/workflows/poeditor.yml | 12 ++++++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-audit.yml b/.github/workflows/build-audit.yml index 9f71aef742..164f6af302 100644 --- a/.github/workflows/build-audit.yml +++ b/.github/workflows/build-audit.yml @@ -5,9 +5,6 @@ on: schedule: - cron: '0 9 * * 6' -env: - node_version: 18 - jobs: audit: runs-on: ubuntu-latest diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml index 8e315acbbd..53db968591 100644 --- a/.github/workflows/package-build.yml +++ b/.github/workflows/package-build.yml @@ -5,9 +5,6 @@ on: branches: - 'master' -env: - node_version: 18 - jobs: build_n_deploy: runs-on: ubuntu-latest diff --git a/.github/workflows/poeditor.yml b/.github/workflows/poeditor.yml index 25b81dc6cf..98a016dd41 100644 --- a/.github/workflows/poeditor.yml +++ b/.github/workflows/poeditor.yml @@ -11,15 +11,19 @@ jobs: Download: runs-on: ubuntu-latest + strategy: + matrix: + node-version: ['20.x'] steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4 with: # fetch full history so things like auto-changelog work properly fetch-depth: 0 - - name: Use Node.js ${{ env.node_version }} - uses: actions/setup-node@v2-beta + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 with: - node-version: ${{ env.node_version }} + node-version: ${{ matrix.node-version }} + cache: 'npm' # setting a registry enables the NODE_AUTH_TOKEN env variable where we can set an npm token. REQUIRED registry-url: 'https://registry.npmjs.org' From cdf83f44e1c5fcde5809eb9ba155ae4dd3dc4dbd Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:22:03 -0700 Subject: [PATCH 09/14] updated to use v4 vs latest --- .github/workflows/release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index abf71f08d6..844297498b 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -8,7 +8,7 @@ jobs: release-notes: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: Create Release Notes uses: docker://decathlon/release-notes-generator-action:2.1.0 env: From bf0f099a302dd82a2e0e328e43921301d3a97820 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:28:09 -0700 Subject: [PATCH 10/14] new single action to build, test and package zip file --- ...{build-test.yml => build-test-package.yml} | 24 +++++++++-- .github/workflows/package-build.yml | 40 ------------------- 2 files changed, 20 insertions(+), 44 deletions(-) rename .github/workflows/{build-test.yml => build-test-package.yml} (80%) delete mode 100644 .github/workflows/package-build.yml diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test-package.yml similarity index 80% rename from .github/workflows/build-test.yml rename to .github/workflows/build-test-package.yml index a517b5e323..45c49ee47c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test-package.yml @@ -1,4 +1,4 @@ -name: Integration Tests +name: Build, Test and Package on: pull_request: @@ -9,7 +9,7 @@ on: - master jobs: - Test: + setup: runs-on: ubuntu-latest strategy: matrix: @@ -36,6 +36,10 @@ jobs: id: package-version uses: martinbeentjes/npm-get-version-action@main + build: + needs: setup + runs-on: ubuntu-latest + steps: - name: Get Env Ready run: | npm ci @@ -55,8 +59,12 @@ jobs: - name: Build App run: | - npm run build + npm run package + Test: + needs: build + runs-on: ubuntu-latest + steps: - name: Run Docker run: | npm run ci-docker-test-start @@ -72,4 +80,12 @@ jobs: - name: Stop Docker run: | npm run ci-docker-test-down - \ No newline at end of file + + Release: + needs: Test + runs-on: ubuntu-latest + steps: + - uses: actions/upload-artifact@v3 + with: + name: ChurchCRM-${{ steps.package-version.outputs.current-version}}.zip + path: target/ChurchCRM-*.zip \ No newline at end of file diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml deleted file mode 100644 index 53db968591..0000000000 --- a/.github/workflows/package-build.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Create A Release - -on: - push: - branches: - - 'master' - -jobs: - build_n_deploy: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: ['20.x'] - steps: - - uses: actions/checkout@v4 - with: - # fetch full history so things like auto-changelog work properly - fetch-depth: 0 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - # setting a registry enables the NODE_AUTH_TOKEN env variable where we can set an npm token. REQUIRED - registry-url: 'https://registry.npmjs.org' - - - name: get-npm-version - id: package-version - uses: martinbeentjes/npm-get-version-action@master - - - name: Install & Build Source - run: npm run deploy - - - name: Package - run: npm run package - - - uses: actions/upload-artifact@v3 - with: - name: ChurchCRM-${{ steps.package-version.outputs.current-version}}.zip - path: target/ChurchCRM-*.zip \ No newline at end of file From a14322bc52e61bb59a2b1a73b884306755159055 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:30:39 -0700 Subject: [PATCH 11/14] ok looks like i can't share env merging setu[/build/test --- .github/workflows/build-test-package.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 45c49ee47c..4762f747ff 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -9,7 +9,7 @@ on: - master jobs: - setup: + test: runs-on: ubuntu-latest strategy: matrix: @@ -36,10 +36,6 @@ jobs: id: package-version uses: martinbeentjes/npm-get-version-action@main - build: - needs: setup - runs-on: ubuntu-latest - steps: - name: Get Env Ready run: | npm ci @@ -61,10 +57,6 @@ jobs: run: | npm run package - Test: - needs: build - runs-on: ubuntu-latest - steps: - name: Run Docker run: | npm run ci-docker-test-start From 051f2970aa50cc7925a76ab5447b08a2ab530500 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:35:22 -0700 Subject: [PATCH 12/14] Fixed Package --- .github/workflows/build-test-package.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 4762f747ff..a7cc023b1c 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -73,11 +73,8 @@ jobs: run: | npm run ci-docker-test-down - Release: - needs: Test - runs-on: ubuntu-latest - steps: - - uses: actions/upload-artifact@v3 + - name: Upload zip file + uses: actions/upload-artifact@v3 with: name: ChurchCRM-${{ steps.package-version.outputs.current-version}}.zip path: target/ChurchCRM-*.zip \ No newline at end of file From 8dda0404a974f24a61455a52bc9ab7352202de72 Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:36:38 -0700 Subject: [PATCH 13/14] Updated Name --- .github/workflows/build-test-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index a7cc023b1c..988039efeb 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -9,7 +9,7 @@ on: - master jobs: - test: + test-n-package: runs-on: ubuntu-latest strategy: matrix: From 44f798194a7650e38555119b23bd8ef878cda51d Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 28 Oct 2023 10:51:50 -0700 Subject: [PATCH 14/14] fixed dbl zip file in the name --- .github/workflows/build-test-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 988039efeb..4988a2f0ed 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -76,5 +76,5 @@ jobs: - name: Upload zip file uses: actions/upload-artifact@v3 with: - name: ChurchCRM-${{ steps.package-version.outputs.current-version}}.zip + name: ChurchCRM-${{ steps.package-version.outputs.current-version}} path: target/ChurchCRM-*.zip \ No newline at end of file