Merge pull request '.' (#39 ) from product-development into master

Reviewed-on: #39
2023-10-18 20:40:40 +00:00 · 2023-10-18 20:40:28 +00:00 · 2023-10-18 21:39:52 +01:00 · 2023-10-18 20:35:55 +00:00 · 2023-10-18 21:32:43 +01:00 · 2023-10-18 20:31:21 +00:00
5 changed files with 4 additions and 2212 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -100,8 +100,8 @@ steps:
  commands:
    - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
    - git add -A
-    - git commit -m '$${DRONE_COMMIT_MESSAGE}'
-    - git push origin --set-upstream $$(git symbolic-ref --short HEAD)
+    - git commit -m "$${DRONE_COMMIT_MESSAGE}"
+    - git push -f origin --set-upstream $$(git symbolic-ref --short HEAD)
  environment:
    GIT_PASSWORD:
      from_secret: GIT_PASSWORD
--- a/equipment-model.a.yml
+++ b/equipment-model.a.yml
--- a/equipment-model.axml
+++ b/equipment-model.axml
--- a/instructions/equipment-model2.a.yml
+++ b/instructions/equipment-model2.a.yml
--- a/instructions/equipment-model2.axml
+++ b/instructions/equipment-model2.axml
Author	SHA1	Message	Date
giles	c88b92af8c	Merge pull request '.' (#39 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #39	2023-10-18 20:40:40 +00:00
giles	1e5820b6e4	Merge pull request '.' (#39 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #39	2023-10-18 20:40:28 +00:00
giles	45bd072e4a	. continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-10-18 21:39:52 +01:00
giles	52334f4414	Merge pull request '.' (#38 ) from product-development into master continuous-integration/drone/push Build is failing Details Reviewed-on: #38	2023-10-18 20:35:55 +00:00
giles	d5cf99fc2d	. continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-10-18 21:32:43 +01:00
giles	d7bb93b851	Merge pull request '.' (#37 ) from product-development into master continuous-integration/drone/push Build encountered an error Details Reviewed-on: #37	2023-10-18 20:31:21 +00:00
giles	f362e88986	Merge branch 'master' into product-development continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-10-18 20:31:15 +00:00
giles	56570b8408	. continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-10-18 21:30:17 +01:00