From c86d7d165b747d42c0134e8469f9c7137c7ca925 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 14:32:18 +0100 Subject: [PATCH 01/10] Update config.yml --- .circleci/config.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8ae1ac6a..139b35ed3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -108,6 +108,8 @@ jobs: root: *workspace paths: - dist/*.* + - store_artifacts: + path: ./dist/*.* deploy_linux: <<: *linux_config @@ -118,6 +120,8 @@ jobs: root: *workspace paths: - dist/*.* + - store_artifacts: + path: ./dist/*.* deploy_mac: <<: *mac_config @@ -128,6 +132,8 @@ jobs: root: *workspace paths: - ./dist/*.* + - store_artifacts: + path: ./dist/*.* calculate_checksums: <<: *linux_config @@ -143,16 +149,12 @@ workflows: - build_windows - build_linux - build_mac + - deploy_windows platform_tests: jobs: - unit_tests deploy: jobs: - - calculate_checksums: - requires: - - deploy_windows - - deploy_linux - - deploy_mac - deploy_windows: filters: branches: @@ -171,3 +173,8 @@ workflows: ignore: /.*/ tags: only: /[v][0-9]+(\.[0-9]+)+.*/ + - calculate_checksums: + requires: + - deploy_windows + - deploy_linux + - deploy_mac \ No newline at end of file From 4653cc2078a71e3d65fb5527c6622a53f141aad3 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 16:03:39 +0100 Subject: [PATCH 02/10] adjust script --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 139b35ed3..60ebce3fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,7 @@ jobs: paths: - dist/*.* - store_artifacts: - path: ./dist/*.* + path: dist/*.* deploy_linux: <<: *linux_config @@ -121,7 +121,7 @@ jobs: paths: - dist/*.* - store_artifacts: - path: ./dist/*.* + path: dist/*.* deploy_mac: <<: *mac_config @@ -133,7 +133,7 @@ jobs: paths: - ./dist/*.* - store_artifacts: - path: ./dist/*.* + path: dist/*.* calculate_checksums: <<: *linux_config @@ -146,13 +146,13 @@ workflows: version: 2 platform_builds: jobs: - - build_windows - - build_linux - - build_mac + # - build_windows + # - build_linux + # - build_mac - deploy_windows - platform_tests: - jobs: - - unit_tests + # platform_tests: + # jobs: + # - unit_tests deploy: jobs: - deploy_windows: From 08a3f4daacab17430c34b606f156630db3b9549e Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 16:09:17 +0100 Subject: [PATCH 03/10] Update config.yml --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60ebce3fa..1484f2a4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,6 +120,9 @@ jobs: root: *workspace paths: - dist/*.* + - run: ls -la + - run: ls -la dist/ + - run: ls -la ./dist/ - store_artifacts: path: dist/*.* @@ -149,7 +152,7 @@ workflows: # - build_windows # - build_linux # - build_mac - - deploy_windows + - deploy_linux # platform_tests: # jobs: # - unit_tests From 4f9033ed579ff10dc183dff6a92c41f99f810f94 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 16:17:36 +0100 Subject: [PATCH 04/10] Update config.yml --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1484f2a4c..5ac2534bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,8 +123,9 @@ jobs: - run: ls -la - run: ls -la dist/ - run: ls -la ./dist/ + - run: pwd - store_artifacts: - path: dist/*.* + path: dist deploy_mac: <<: *mac_config From 9fb0a497ae71045bf9530f9b5dc4b67e8c4d1e68 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 16:29:34 +0100 Subject: [PATCH 05/10] Update config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ac2534bf..2dfa4ae78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,6 +126,8 @@ jobs: - run: pwd - store_artifacts: path: dist + - store_artifacts: + path: dist/nOS** deploy_mac: <<: *mac_config From 92ff3485ac47cef41cabfbd357c15eed582fc826 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 16:34:05 +0100 Subject: [PATCH 06/10] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2dfa4ae78..7941e4d02 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,7 +127,7 @@ jobs: - store_artifacts: path: dist - store_artifacts: - path: dist/nOS** + path: dist/nOS* deploy_mac: <<: *mac_config From a8d762c00ba2142da7bd14cceb9cabc4bc04212e Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 16:35:14 +0100 Subject: [PATCH 07/10] Update config.yml --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7941e4d02..a0eb6d022 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,7 @@ jobs: paths: - dist/*.* - store_artifacts: - path: dist/*.* + path: dist deploy_linux: <<: *linux_config @@ -139,7 +139,7 @@ jobs: paths: - ./dist/*.* - store_artifacts: - path: dist/*.* + path: dist calculate_checksums: <<: *linux_config @@ -156,6 +156,9 @@ workflows: # - build_linux # - build_mac - deploy_linux + - calculate_checksums: + requires: + - deploy_linux # platform_tests: # jobs: # - unit_tests From 98a62532458c78f73d7e7346b06ccc95ec87b4c1 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 17:02:37 +0100 Subject: [PATCH 08/10] Update config.yml --- .circleci/config.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0eb6d022..08aea249a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -152,16 +152,12 @@ workflows: version: 2 platform_builds: jobs: - # - build_windows - # - build_linux - # - build_mac - - deploy_linux - - calculate_checksums: - requires: - - deploy_linux - # platform_tests: - # jobs: - # - unit_tests + - build_windows + - build_linux + - build_mac + platform_tests: + jobs: + - unit_tests deploy: jobs: - deploy_windows: From 0e1772e7746bc753af44d00b3a90c7300a879f19 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 17:02:59 +0100 Subject: [PATCH 09/10] Update config.yml --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 08aea249a..23bbcb679 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,14 +120,8 @@ jobs: root: *workspace paths: - dist/*.* - - run: ls -la - - run: ls -la dist/ - - run: ls -la ./dist/ - - run: pwd - store_artifacts: path: dist - - store_artifacts: - path: dist/nOS* deploy_mac: <<: *mac_config From 7998d5ec5616ee9894e91391011aa172cc1ef2d2 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup <10922045+DalderupMaurice@users.noreply.github.com> Date: Sun, 21 Nov 2021 17:03:26 +0100 Subject: [PATCH 10/10] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 23bbcb679..08bba8b95 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,4 +176,4 @@ workflows: requires: - deploy_windows - deploy_linux - - deploy_mac \ No newline at end of file + - deploy_mac