d515d89818
Remove trigger
2023-04-24 20:01:59 +01:00
02234f32c6
Undo trigger
2023-04-24 20:01:59 +01:00
2f8c50cee1
Rename scripts
2023-04-24 20:01:59 +01:00
35bc055ba6
Change release pipelines
2023-04-24 20:01:59 +01:00
29ed6bf10b
Release only on develop
2023-04-24 20:01:58 +01:00
410046cae2
Run tag only on develop
2023-04-24 20:01:58 +01:00
7e271fed18
Bump version via node script
2023-04-24 20:01:49 +01:00
2735f1bfc6
Try fetching
2023-04-24 20:01:49 +01:00
c5e6158329
Remove pull
2023-04-24 20:01:49 +01:00
a2746ec241
Cleanups
2023-04-24 20:01:49 +01:00
d8cfb68082
--no-git-reset
2023-04-24 20:01:49 +01:00
7018fea06f
Add logging
2023-04-24 20:01:30 +01:00
9cbc90e724
Trigger
2023-04-24 20:01:20 +01:00
c96c5350d6
Commit all
2023-04-24 20:00:59 +01:00
f9028e1a3f
Commit instead of reseting
2023-04-24 20:00:59 +01:00
acc79f9363
Clean submodules
2023-04-24 20:00:52 +01:00
7591ab3428
Remove paths on workflow
2023-04-24 20:00:42 +01:00
59aefecdd4
Reset git before publish
2023-04-24 20:00:37 +01:00
5e844ac6db
Run yarn after changing versions
2023-04-24 20:00:22 +01:00
9387d37d3b
Use 0.0.1
2023-04-24 20:00:22 +01:00
cc73606c71
Yarn after version updates
2023-04-24 20:00:13 +01:00
1ed1424d89
Use my user as git for testing
2023-04-24 19:58:54 +01:00
fa3f65a0e5
Fix fetching version
2023-04-24 19:58:54 +01:00
aa61dc6887
Update versions
2023-04-24 19:58:54 +01:00
a70ebc9faf
Update tag-prerelease.yml
2023-04-24 19:58:54 +01:00
7275600be9
Bump lerna.json only
2023-04-24 19:58:54 +01:00
3837c5c8f4
Tag
2023-04-24 19:58:54 +01:00
ebde64eee8
Remove yarn
2023-04-24 19:58:54 +01:00
dbc9f70974
Rely on lerna version
2023-04-24 19:58:54 +01:00
5f8451b6e5
Yarn lerna
2023-04-24 19:58:40 +01:00
4bc036c390
Use lerna
2023-04-24 19:58:40 +01:00
5824b45c20
Remove check for testing
2023-04-24 19:58:40 +01:00
1bcb481d69
Change publish process
2023-04-24 19:58:40 +01:00
af8a27fa10
Setup git user
2023-04-24 19:58:40 +01:00
e10eba9447
Remove check
2023-04-24 19:58:40 +01:00
6ecb062acf
Tag action
2023-04-24 19:58:40 +01:00
afc5c99c6f
Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule"
...
This reverts commit df18119b56676b85dbd8
2023-04-20 19:48:29 +01:00
e65225996e
Revert https://github.com/Budibase/budibase/pull/10267
2023-04-20 19:04:20 +01:00
98b372965c
Merge branch 'develop' into chore/pro_as_submodule
2023-04-19 10:22:48 +01:00
d36cd3b1f8
Builder Unit Test PoC ( #10173 )
...
* wip
* wip
2023-04-18 14:37:29 +01:00
d16bf6b149
Split test-pro from test
2023-04-18 12:27:12 +01:00
37158594f7
Merge branch 'develop' into chore/pro_as_submodule
2023-04-18 12:21:38 +01:00
96a2c52054
Add more dev info
2023-04-18 12:18:39 +01:00
90506265ab
Back to the working version
2023-04-18 12:07:09 +01:00
cedadb6c00
Try remote update
2023-04-18 12:03:34 +01:00
eb2d3c8c29
Fetch depth
2023-04-18 12:01:34 +01:00
2e1231b6e7
Fetch origin
2023-04-18 11:57:12 +01:00
767f9ae792
Test
2023-04-18 11:53:13 +01:00
86efe11dd8
Remove logs
2023-04-18 11:52:03 +01:00
f3effc4b9b
More logs
2023-04-18 11:50:15 +01:00
291908dde0
Next
2023-04-18 11:32:02 +01:00
38a7c96d77
Log branches
2023-04-18 11:28:19 +01:00
e5411277fd
Fetch all branches
2023-04-18 11:25:33 +01:00
3b3e1f5247
Try
2023-04-18 11:24:14 +01:00
2916fbe5e4
Use recursive
2023-04-18 11:21:35 +01:00
46e76ea0b5
Add fetch-depth 0 back
2023-04-18 11:19:02 +01:00
2fa60ccf54
Extract
2023-04-18 11:18:06 +01:00
00698d48d6
Use current sha
2023-04-18 11:17:12 +01:00
a6af18daae
Test if fetch depth 2 works
2023-04-18 11:15:25 +01:00
e89a4a366d
Working! Branch pointing to develop
2023-04-18 11:07:20 +01:00
df0079f1f5
Add origin
2023-04-18 11:05:40 +01:00
773ae58d9c
Attempt with fetch
2023-04-18 11:00:46 +01:00
9fceb6371d
Next attempt
2023-04-18 10:57:38 +01:00
67fc09e256
Copy
2023-04-18 10:52:38 +01:00
5d24a25dca
Remove origin from branch
2023-04-18 10:44:26 +01:00
bef3ed7ced
Log less
2023-04-18 10:19:11 +01:00
e39dd1324d
Fetch history
2023-04-18 10:14:14 +01:00
fc5a5f92fa
Logging log
2023-04-18 10:09:11 +01:00
187c64d351
Logs
2023-04-17 21:37:20 +01:00
84a9e41efe
Try
2023-04-17 21:32:12 +01:00
08ba41c5aa
..
2023-04-17 21:05:41 +01:00
edce4fc4ed
More logs
2023-04-17 21:00:16 +01:00
5215f4d400
Add git fetch
2023-04-17 20:56:03 +01:00
52a6c872c2
Git log
2023-04-17 20:53:45 +01:00
dfc58cff00
Attempt 2
2023-04-17 20:51:52 +01:00
aeb28b3366
Next
2023-04-17 20:50:49 +01:00
8374974ecd
Next
2023-04-17 20:49:48 +01:00
9df022c8bf
Fix
2023-04-17 20:48:26 +01:00
467842c84c
Fix
2023-04-17 20:45:30 +01:00
3905c3af47
Attempt 1000
2023-04-17 20:44:29 +01:00
81929802e1
Clean actions
2023-04-17 20:30:06 +01:00
58330bba92
Use ref
2023-04-17 20:26:03 +01:00
6dc40fca6f
Update var
2023-04-17 20:23:23 +01:00
cdcbc9ec78
Try using branch name
2023-04-17 20:22:07 +01:00
9c28413274
Attempt
2023-04-17 20:20:31 +01:00
4d3a93b1de
Log
2023-04-17 20:10:02 +01:00
2bbe4360bf
Attempt 55
2023-04-17 20:08:53 +01:00
0972b481fe
Fix
2023-04-17 20:04:27 +01:00
061ec2eb2d
Fix
2023-04-17 20:02:57 +01:00
307587c982
Fix action
2023-04-17 20:01:20 +01:00
03a5eef593
Fix action
2023-04-17 19:59:01 +01:00
0590ae8b80
Add token
2023-04-17 19:47:31 +01:00
0be32afbc7
Add submodule check
2023-04-17 19:46:13 +01:00
5192eefc16
Remove unnecessary second build in pipeline
2023-04-14 16:28:22 +01:00
523bacabc3
Remove second conflicting yarn build
2023-04-14 14:00:37 +01:00
b8d9311b49
Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule
2023-04-13 09:41:59 +01:00
b71169deee
Fix how version is processed in helm chart ( #10277 )
2023-04-12 16:30:10 +01:00
3b9887c66c
Use helm .Chart.AppVersion instead of specifying value ( #9933 )
...
* Use helm .Chart.AppVersion instead of specifying value
* Backwards compatibility with existing process for deploying chart from source where Chart.AppVersion hasn't been generated yet
2023-04-12 13:49:25 +01:00
cc64539981
Remove test pro
2023-04-12 10:50:10 +01:00
120b27ae20
Add token
2023-04-12 10:35:58 +01:00
4e9a8fd7d2
Pull submodules on actions
2023-04-12 10:27:10 +01:00
7d792e22bd
Remove install pro in pipelines
2023-04-11 17:16:04 +01:00
77ffb8d86d
Run integration suite in CI again / auto detect tenancy / refactors ( #10209 )
...
* qa-core-ci-fixes
* global setup and teardown wip
* Updates to logs and setup
* Remove date and console mocking
* Update CI to spin up minimal dev env
* Update readme
* Fix scopeBackend.sh
* Ensure docker services are initialised before starting worker
* Lint
* Fix admin user being created on startup (#10219 )
* use regular bootstrap and build
* Lint
* Temp: re-use global setup to get around app limit in QA
2023-04-05 15:33:56 +01:00
457262b0b4
Remove integration test in ci. The CI runs currently run against the deprecated release env and don't run against the live code
2023-03-31 22:37:54 +01:00
74995381f4
Remove client build in CI
2023-03-31 12:30:20 +01:00
d6992bbf94
Merge branch 'master' into merge-master-develop
2023-03-29 11:52:09 +01:00
772a732194
Making sure client is built, before running server tests.
2023-03-28 01:01:01 +01:00
972897faf7
Splitting server tests out to run separately to main lerna thread.
2023-03-28 00:33:46 +01:00
b0d3e79dd4
Removing files from coverage upload to see if it correctly resolves all coverage automatically.
2023-03-27 23:52:45 +01:00
878d0f6dab
Updating to codecov-action v3 as v1 deprecated.
2023-03-27 22:55:57 +01:00
2e8483152f
Adding back backend-core and worker coverage.
2023-03-27 22:52:01 +01:00
71e4ab6215
Testing simplifying coverage (fix server issue).
2023-03-27 22:32:23 +01:00
47a95299cd
Update bug_report.md
2023-03-24 15:24:54 +00:00
931c295c9a
Fix preprod stale deploy ( #10034 )
2023-03-15 10:13:02 +00:00
63cf91218d
Merge branch 'master' of github.com:Budibase/budibase into develop
2023-03-14 14:12:32 +00:00
feecb53017
Fix app version tag ( #9969 )
2023-03-09 16:40:32 +00:00
acc193aa87
Replace get previous tag with package version ( #9968 )
2023-03-09 16:33:48 +00:00
a03a96038d
merge master into develop ( #9964 )
2023-03-09 15:54:20 +00:00
3ee07d3949
Replace GH_PERSONAL_TOKEN with GH_ACCESS_TOKEN for pulling values from infra ( #9962 )
2023-03-09 15:22:29 +00:00
57850c7b8e
Supply kubeconfig to preprod deploy job ( #9957 )
2023-03-09 12:12:01 +00:00
df3b6add17
fix-preprod-deploy ( #9955 )
2023-03-09 11:16:08 +00:00
0f981f33c4
Re-add legacy preprod ( #9953 )
...
* Re-add legacy preprod
* Remove needs images
2023-03-09 11:02:09 +00:00
8cfd3ed936
Update issue templates
...
Include the `linear` badge for bug reports.
2023-03-08 12:20:32 +00:00
2500527354
tidy actions ( #9922 )
...
* tidy actions
2023-03-07 16:03:02 +00:00
f1a5ffcaea
Add checkout to preprod deploy ( #9921 )
2023-03-07 15:14:39 +00:00
1a0e71f4aa
Add release helm chart to release job ( #9918 )
...
* Add release helm chart to release job
* Update job name from release to release-images
* add get previous tag to all jobs
2023-03-07 14:39:54 +00:00
e251b84d60
replace preprod with new EKS deployment ( #9889 )
2023-03-07 13:34:18 +00:00
97f0b76d82
removing test step from release
2023-03-06 11:30:21 +00:00
f7d6c37fc7
merge
2023-03-03 16:49:04 +00:00
7819908fe2
Pin node version in release-selfhost job
2023-03-01 22:03:34 +00:00
60a4d46fd3
Break out pro tests into their own ci job
2023-02-27 15:55:46 +00:00
2e829ce8a6
Merge pull request #9785 from Budibase/configs-refactor-and-server-test-fixes
...
Configs / Server tests / Failing real email tests updates
2023-02-27 14:00:21 +00:00
fd085847c3
Remove temporary ci branch
2023-02-27 13:53:10 +00:00
2c46109e7d
Enforceable SSO ( #9787 )
...
* Add ENFORCEABLE_SSO feature flag
* First draft of enforce sso configuration / show single sign on url
* Reading and writing isSSOEnforced + integration with login page
* Enable CI + lint
* Set correct base branch for CI
* Test fix for expected string changed
* Use tenant aware platform url as SSO link
* Bring in latest pro changes
* Lint
* Add useEnforceableSSO mock helper function
* Update configs.spec.ts with coverage for public settings
* Update users.spec.ts with additional tests for isPreventPasswordActions
* Lint
* Update refresh OAuthToken to use correct enum and add case statement
2023-02-27 13:42:51 +00:00
9aea8bfec4
Use forked helm action ( #9814 )
2023-02-27 10:01:43 +00:00
c14c57bc63
Fix helm action ( #9804 )
...
* Downgrade glopezep/helm to 1.7.0
* Downgrade glopezep/helm to 1.6.1
2023-02-24 16:34:13 +00:00
b0fd593db5
Downgrade glopezep/helm to 1.7.0 ( #9803 )
2023-02-24 16:27:50 +00:00
b17f411183
Remove deploy to release env ( #9793 )
2023-02-24 09:16:18 +00:00
940de8b6a0
Run CI steps in parallel ( #9760 )
...
* Parallel CI
* Add build to integration test
* Add checkout to top of each run
* Revert branch update for ci job
* Experiment with --runInBand for CI
* Fix intermittent backend-core migration test failure
* Fix hanging worker redis connection
* Update naming from reset to newTenant
2023-02-21 17:13:24 +00:00
eb6b49d843
Fix qa deploy dispatch ( #9724 )
2023-02-17 08:25:10 +00:00
89829965d4
Remove test on release-develop job (temporary) ( #9711 )
...
* Remove test on release-develop job (temporary)
* Remove test on release-develop job (temporary)
* Speed up pro release script by adding no verify flag to version update commits
2023-02-16 14:14:22 +00:00
9ca6aa8bbc
tidy up
2023-02-15 23:43:53 +00:00
6b5128a0bf
running API tests with reporting qa nightly tests
2023-02-15 23:38:59 +00:00
cb0f3d89ca
removing linear tag so bot can perform instead
2023-02-07 15:00:28 +00:00
bad0cf5d55
Create config.yml
2023-02-07 09:19:39 +00:00
ecfd4f94d1
Update feature_request.md
2023-02-07 09:14:48 +00:00
e4d39c9eee
Update bug_report.md
2023-02-07 09:14:25 +00:00
7c74e8c7b3
Automate account-portal qa deploy from develop ( #9501 )
2023-02-01 16:32:49 +00:00
0164ca443b
Update smoke_test.yaml
...
Removing Cypress from smoke_test.yaml file
- No longer needed
2023-01-31 17:05:41 +00:00
f731c073b4
Update bug_report.md
2023-01-18 15:59:57 +00:00
6310d1912f
Update bug_report.md
2023-01-11 15:18:39 +00:00
f70ba6bff4
Add workaround to preserve creation date on chart publishing ( #9219 )
...
Employ the same workaround added to the chart publishing in `release-develop` workflow. See: https://github.com/Budibase/budibase/pull/9099
2023-01-09 08:21:48 +00:00
0bd551505c
Delete rpowell-temp.yml
2023-01-05 10:07:33 +00:00
788ae011a2
Update rpowell-temp.yml
2023-01-05 09:52:00 +00:00
80dc849987
Create rpowell-temp.yml
2023-01-05 09:51:10 +00:00
b635614f77
Allow proxy upstream URLs to be configured at runtime ( #7413 )
...
* allow proxy upstream urls to be configured at runtime
* make dynamic upstream urls in proxy the default behaviour
* reorder env directives
* Use appVersion for proxy image
* Update couch upstream for proxy
* proxy ci updates - WIP
* allowing custom resolvers in proxy service deployment
* remove generateProxyConf script for prod and remove from builds
* remove generateProxyConfig script
* removing nginx dev conf
* delete generated nginx conf
Co-authored-by: Thomas Weiß <panos@unbunt.org>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
2022-12-20 16:28:13 +00:00
57009c6e73
Fix for release version in qa deploy notification ( #9132 )
...
* Fix for release version in qa deploy notification
* Re-add dependency on chart job
2022-12-20 16:10:02 +00:00
3c856f2b5f
Update job name
2022-12-19 16:04:58 +00:00
0171514c53
Re-enable concurrency
2022-12-19 16:03:07 +00:00
3e3029e4d6
Publish helm chart with correct app version, publish on develop ( #9099 )
...
* Publish helm chart with correct app version, publish on develop
* Uncomment checkout
* Remove concurrency flag temporarily
* Prevent created at timestamp from changing on each helm repo index
* Add logging
* Fix syntax error
* Add logging
* Fix package command
* Remove copy tgz
* Update commit message
* Add job to trigger budibase-deploys
* Fix repository
* Update access token
* Update access token
* Update access token
* Separate deploy release env from docker image release
* Dependency between image release and chart release
2022-12-19 16:01:12 +00:00
ac105bbe3a
Add worker and backend-core to codecov-action
2022-11-14 14:13:55 +00:00
57bbf28119
merge with master
2022-09-26 17:57:23 +01:00
30ccf00232
remove superfluous env vars
2022-09-26 15:52:01 +01:00
f39f789a66
remove install pro and add protection to single image build to fail off master
2022-09-26 15:45:14 +01:00
e3bb57b97a
Merge branch 'develop' of github.com:Budibase/budibase into public-api-sdk
2022-09-26 14:15:25 +01:00
886a90d1fd
only run in test mode if couch url is not passed
2022-09-26 10:40:37 +01:00
f0bcf606bc
turn off unit tests
2022-09-26 09:41:49 +01:00
e06afeb194
adding startup script for local
2022-09-25 23:43:37 +01:00
25ce82fa4b
using real couch in integration tests
2022-09-24 13:17:21 +01:00
afcd40a9e5
Build SDK as part of release workflows which publish to NPM
2022-09-21 09:09:12 +01:00
6bdfe435cb
Update epic.md
2022-09-19 12:24:20 +01:00
b48ffd8b72
Update epic.md
2022-09-19 12:22:40 +01:00
2bed681621
Create epic.md
2022-09-19 12:19:49 +01:00
d6c8527340
tidy up
2022-09-15 20:09:23 +01:00
bc090f5f9d
better tests and cleaner import for server
2022-09-15 19:51:11 +01:00
32be537023
make sure yarn gets run in qa-core
2022-09-06 09:08:49 +01:00
c3f15b5af2
QA Core repo, and Jest API tests running end to end
2022-09-05 18:28:53 +01:00
410f2971e7
separate rollouts into separate steps
2022-08-23 12:07:57 +01:00
9de0bfe053
use pre-encoded kubeconfig secret
2022-08-23 11:12:38 +01:00
55ff9f996d
fix service re-roll
2022-08-23 10:41:50 +01:00
3f661d06a9
enforce fail
2022-08-22 12:01:50 +01:00
81a00424b2
base64 encode the kubeconfig
2022-08-18 12:21:01 +01:00
96be712f89
Update deploy-release.yml
2022-08-18 12:09:36 +01:00
881d350c66
Merge pull request #7251 from Budibase/fix/various-fixes-martin
...
roll out release services after deployment
2022-08-16 10:17:59 +01:00
9a9e4c0975
add to release job
2022-08-12 17:48:50 +01:00
a817756db8
reset appVersion to develop
2022-08-12 17:45:31 +01:00
52feda77de
roll out release services after deployment
2022-08-12 17:42:46 +01:00
1c7f860184
Merge branch 'master' of github.com:Budibase/budibase into develop
2022-08-11 16:28:46 +01:00
eb6304f181
Revert to using branches only for selfhost release
2022-08-10 17:07:33 +01:00
85af9b0615
Add git fetch --tags to release-selfhost
2022-08-10 16:24:50 +01:00
dbf6376910
Add git fetch --tags to release-selfhost
2022-08-10 16:17:56 +01:00
bc5a36dd53
Merge branch 'master' into merge-master
2022-08-10 15:46:30 +01:00
d31cc3a96d
Checkout tag
2022-08-10 14:07:21 +01:00
65189c0b13
Add version support release-selfhost.yml
2022-08-10 13:57:33 +01:00
c44ae30721
merge from master
2022-08-09 11:52:48 +01:00
a4e934bbd6
Merge pull request #7151 from Budibase/fix/cli-build
...
Fixing CLI CI build
2022-08-08 17:39:43 +01:00
27d81a7f51
Updating self host release to fix issues with CLI build.
2022-08-08 14:14:35 +01:00
d36ff097ee
Update posthog token
2022-08-08 14:03:04 +01:00
40b22019ea
Disable posthog in release env
2022-08-08 11:51:38 +01:00
de5d1cea3e
amendments for PR comments
2022-08-05 10:57:13 +01:00
011b97d57f
important note for pro modifications
2022-07-28 20:35:43 +01:00
33e1d69341
linking to doc instead of symlink to make it readable on Github
2022-07-28 11:21:06 +01:00
51620dfc35
cleaning dependencies before bootstrap to linking pro version
2022-07-28 11:13:03 +01:00
1cb7855dfa
Update bug_report.md
2022-07-20 13:09:27 +01:00
5373e784c0
WIP: add Azure App Service image to docker registry
2022-07-18 12:21:01 +01:00
433e9402ac
Switching single image build to workflow dispatch.
2022-07-14 18:50:09 +01:00
f4b75b8f50
Fix for single image build, make sure predocker commands always ran.
2022-07-13 16:39:38 +01:00
1ed8fe1893
fix input from release job
2022-07-11 17:17:05 +01:00
ec20f173bb
automating CI release
2022-07-11 16:05:41 +01:00
36c8be1149
Merge pull request #6637 from Budibase/fix/release-removals
...
remove beta stuff and remove self-host banners
2022-07-11 11:54:52 +01:00
367cf37795
remove beta stuff and remove self-host banners
2022-07-11 11:08:56 +01:00
4439dc73b7
Updating tags to sufficient access level.
2022-07-07 18:13:46 +01:00
af409a532c
Adding login action.
2022-07-07 16:38:48 +01:00
6f33c4ae68
Adding push to deploy image.
2022-07-07 14:32:48 +01:00
175e48961b
Removing testing from single image deployment as its already carried out by CI workflow.
2022-07-06 16:56:05 +01:00
fd7fc1df34
Adding QEMU builder for ARM builds.
2022-07-06 16:53:25 +01:00
83c9ab9788
Merge branch 'develop' of github.com:Budibase/budibase into omnibus-action
2022-07-06 11:10:16 +01:00
772d975f9d
Adding correct release tag
2022-07-05 19:56:47 +01:00
fddd124ac4
updating CI job to upload to correct dir
2022-07-01 00:33:01 +01:00
0c04ac58a6
move logic to cloud URL to backend
2022-06-28 22:45:05 +01:00
c295c31152
Update release-develop.yml
2022-06-28 18:07:43 +01:00
251520bcd1
adding types
2022-06-28 12:16:23 +01:00
de08fe0160
PR comments
2022-06-28 11:53:57 +01:00
e091b1a038
WIP: Pipeline for Single Image deploy tag
2022-06-27 16:27:19 +01:00
8780b7f897
WIP: Pipeline for Single Image deploy
2022-06-27 14:37:46 +01:00
b6c1305b5b
WIP: Pipeline for Single Image deploy
2022-06-27 14:17:04 +01:00
4bf8d68ae0
WIP: Pipeline for Single Image deploy
2022-06-27 13:43:54 +01:00
ffe1fb9524
WIP: Pipeline for Single Image deploy
2022-06-27 12:35:35 +01:00
6559586ec5
WIP: Pipeline for Single Image deploy
2022-06-27 12:13:33 +01:00
7bc505b13f
Pro contributing and CI/CD docs
2022-06-23 10:02:57 +01:00
055842fce4
Merge pull request #6391 from Budibase/docs
...
add docs for contrib env setup
2022-06-20 14:35:05 +01:00
a4a6ce2b38
Update workflow readmes and rename release staging to prerelease
2022-06-20 13:27:03 +01:00
7a97dd14e3
Fix typo on branch name check
2022-06-20 12:51:57 +01:00
e0916610c2
add docs for contrib env setup
2022-06-20 12:48:45 +01:00
544db02f2c
Add dispatch deploy job for release env
2022-06-20 12:14:16 +01:00
ebbe2d0628
Revert release pipeline to use develop again
2022-06-20 10:40:05 +01:00
e63142866c
Update release ph token
2022-06-13 16:25:22 +01:00
b0dc1f4e6b
Disable develop branch name check
2022-06-13 11:23:02 +01:00
4584643ee3
Update debug command
2022-06-07 09:01:43 +01:00
96e1703147
Add debug log level to lerna bootstrap
2022-06-07 08:55:32 +01:00
2e7c7b7050
Add yarn cache clean to CI
2022-06-07 08:41:00 +01:00
38f0e6447c
Add command to re-install yarn on CI to test issue
2022-06-07 08:37:41 +01:00
48f900e447
delete unnecessary job
2022-06-06 23:32:04 +01:00
d15dfb83fc
new ui functionality working from S3 bucket
2022-06-06 23:30:36 +01:00
0094c83216
Environment config
2022-06-06 15:27:29 +01:00
b0b83ae5a0
Update workflows to use release instead of develop (temporarily)
2022-06-06 11:18:41 +01:00
8cc1e4e4d0
groundwork
2022-06-01 13:03:59 +01:00
373918a40c
use develop tag for docker pull
2022-05-27 00:34:32 +01:00
f7272c29b6
proxy generation for release env
2022-05-27 00:10:43 +01:00
2b21337c98
Merge pull request #6072 from Budibase/ci/staging-cloud-deploy
...
Ci/staging cloud deploy
2022-05-26 17:44:03 +01:00
f98e1406b4
fix formatting
2022-05-26 14:39:37 +01:00
74b381c763
CI job for staging deploy
2022-05-26 13:58:17 +01:00
f499de643a
merging report inline HTML, fixing webhook to prevent 400s from discord
2022-05-20 16:47:09 +01:00
a042af3c86
fix smoke_test job
2022-05-19 23:42:05 +01:00
df0f922890
lint
2022-05-18 19:55:41 +01:00
6bfb611de4
initial smoke test reporting
2022-05-16 23:08:05 +01:00
1bf18776e0
Add self host deploy notification
2022-05-13 09:59:40 +01:00
3d9e447b0c
Add concurrency flags to release jobs to ensure no parallel execution
2022-05-12 21:13:08 +01:00
181a038343
Merge branch 'master' of github.com:Budibase/budibase
2022-05-06 09:21:52 +01:00
c5294bb2d0
adding correct dashboard URL output for cypress
2022-05-06 09:20:56 +01:00
27e4d900cb
Update smoke_test.yaml
2022-05-06 09:19:50 +01:00
6adb09d8d3
Add test:ere:ci:record variant
2022-05-03 15:52:46 +01:00
40d28238b9
Add workflow_dispatch to ci, release-develop and release (master)
2022-05-03 14:18:18 +01:00
b3fb74de0a
record cypress runs in smoke test
2022-05-03 10:06:54 +01:00
31c93e5653
removing couchDB backup from values.yaml
2022-04-28 09:12:45 +01:00
41cf33a0a0
step 3
2022-04-27 18:38:27 +01:00
18faa59eb4
Update git config to be global on release
2022-04-27 09:37:42 +01:00
752dfc4ba5
auto release to preprod
2022-04-26 09:47:32 +01:00
f6284cc697
Sync versions of pro and backend-core
2022-04-25 12:19:36 +01:00
9105c1cbdd
Add access token to top level env
2022-04-21 22:20:38 +01:00
46155c8308
Add access token to env
2022-04-21 22:19:52 +01:00
96de55bf4f
Update pro install scripts with branch handling
2022-04-21 22:12:57 +01:00
381c23325a
Update pro install and release scripts
2022-04-21 21:55:16 +01:00
637100adb8
Revert testing changes to release-develop.yml
2022-04-20 21:25:12 +01:00
74710b9c70
Change gh username order
2022-04-20 20:59:37 +01:00
86c21b422a
Change gh username order
2022-04-20 20:58:57 +01:00
404d496414
Set global git commit username
2022-04-20 20:32:00 +01:00
2a50279f54
Change how version is parsed
2022-04-20 17:30:42 +01:00
5b1db40dac
Update branch processing
2022-04-20 17:12:40 +01:00
8c33297abe
Update branch processing
2022-04-20 17:02:06 +01:00
90bb5ee85c
Update branch processing
2022-04-20 16:50:53 +01:00
e5a241fef4
Update branch processing
2022-04-20 16:48:45 +01:00
e818181eec
Update branch processing
2022-04-20 16:47:42 +01:00
58b67ef7aa
Update branch processing
2022-04-20 16:42:03 +01:00
b94fae9bb8
Update branch processing
2022-04-20 16:40:51 +01:00
70387b3ed6
Update branch processing
2022-04-20 16:38:56 +01:00
14ffba2e12
Resolve current branch on release job
2022-04-20 16:21:05 +01:00
74ac556e9e
Add pro release to release-develop
2022-04-20 16:11:06 +01:00
d2a4e0a934
Merge branch 'develop' into feature/licensing
2022-04-20 14:59:36 +01:00
e4f423dc81
Collect hosting information in bug report template
2022-04-19 08:48:31 +01:00
bb4edf186e
Run setup in pro directory
2022-04-13 22:31:51 +01:00
197891078a
Remove CI check from dependency link script
2022-04-13 22:10:58 +01:00
db23ba2dad
Change how branch is determined
2022-04-13 22:04:28 +01:00
bdf1fba544
Change checkout directory
2022-04-13 21:54:56 +01:00
3639525413
Link bb and pro branch checkout
2022-04-13 21:42:09 +01:00
bd5237c83e
Add token to pro checkout
2022-04-13 21:27:52 +01:00
fa1f9ad6cc
Merge branch 'develop' into feature/licensing
2022-04-13 21:24:07 +01:00
d87714107d
Add checkout pro step to budibase-ci
2022-04-13 21:13:01 +01:00
420f40d4a5
Merge pull request #5343 from daawaan/fix/win10-dev
...
Support Windows 10 development
2022-04-13 12:12:02 +01:00
f9c2f1cd9c
Update smoke_test.yaml
2022-04-12 10:06:45 +01:00
8479d69a86
initial commit
2022-04-11 10:02:40 +08:00
8e5fe49db4
Update smoke_test.yaml
2022-03-30 17:15:41 +01:00
a7b84aaff6
fix workflow file
2022-03-29 17:53:34 +01:00
d2d54d1343
adding smoke test run on schedule, with discord webhook
2022-03-29 17:50:52 +01:00
e3fac51023
Adding a hard reset to helm chart release to stop yarn lock changes blocking release.
2022-03-14 15:53:24 +00:00
b166c5dcdc
revert NPM script to update OpenAPI
2022-03-10 11:17:15 +00:00
6dbc0f842e
reset git head after spec push
2022-03-10 11:10:14 +00:00
8fa600a1bb
updating selfhost job
2022-03-10 11:08:02 +00:00
14768d0479
proxy publishing script
2022-03-10 06:59:17 +00:00
0a6f1ab0db
adding k8s flags
2022-03-10 06:42:28 +00:00
b28bffbb15
Merge pull request #4631 from Budibase/ci/deploy-proxy
...
removing need for handlebars in nginx script, automating proxy servic…
2022-03-03 09:06:49 +00:00
dd34e3cd3f
Updating release cycle to include Open API specs.
2022-02-28 13:25:09 +00:00
c7d46dea35
update tag name
2022-02-22 13:31:19 +01:00
1cbca0578a
removing need for handlebars in nginx script, automating proxy service deployment
2022-02-22 13:24:21 +01:00
441ddc1c31
use cypress CI action as runner
2022-02-17 21:10:19 +01:00
675d195b21
Fixing an issue with self host release CI action.
2022-02-12 11:53:26 +00:00
1cc7109551
Update release-selfhost.yml
2022-02-11 19:40:28 +01:00
d1cebc61a9
merge with master
2022-02-10 18:57:26 +01:00
951a1ba3d2
Update deploy-preprod.yml
...
Temporary fix in deliverybot helm action
2022-02-09 15:20:09 +01:00
c11e26cb2e
merge
2022-02-01 11:22:14 +01:00
4588d5bbf0
wc on right file for smoke test
2022-01-14 15:25:59 +01:00
8500410b6b
adding smoke test job for testing
2022-01-14 15:18:39 +01:00
93caf5bede
Merge branch 'master' of github.com:Budibase/budibase into feature/envoy-nginx
2022-01-13 18:53:34 +01:00
82fd3e1fd0
re-add cli executable
2022-01-13 15:31:17 +01:00
d8cb48a1a7
use selfhost job definition from master
2022-01-13 15:17:58 +01:00
4b6e88075d
merge with master
2022-01-13 14:58:17 +01:00
6721b234ac
nginx dev setup
2022-01-11 20:33:22 +01:00
07fb8cbb13
Updating CLI to build required versions and including it as part of the release workflow.
2022-01-05 16:41:09 +00:00
de6d060234
Prevent stalebot from closing issues
2022-01-04 10:54:47 -05:00
45d82141ca
Consolidate CI docs in CONTRIBUTING.md
2022-01-04 10:48:48 -05:00
bc6c50482c
Merge branch 'master' of github.com:Budibase/budibase into feature/dynamo-describe
2021-12-31 15:28:34 +00:00
ac67b11301
only kick off build on certain paths
2021-12-31 13:59:48 +00:00
a3b3b36f08
Merge pull request #3885 from Budibase/stalebot/prevent-close
...
Prevent stalebot from closing issues
2021-12-31 08:23:05 +00:00
18ad8ac1e5
configurable query timeout, s3 options for minIO, safety on cloud deploy job
2021-12-30 17:44:27 +00:00
3411247f50
Update CONTRIBUTING.md
2021-12-30 10:00:52 +00:00
7551cc76a3
Prevent stalebot from closing issues
2021-12-29 09:40:11 -05:00
f71432a7d2
turning back on master, adding docs for CI pipelines
2021-12-21 17:44:04 +00:00
6aeb9d8d07
wc on preprod values
2021-12-21 16:25:51 +00:00
9aeb2eee1a
preprod linecount
2021-12-21 16:21:44 +00:00
a77d6cbc42
package then commit
2021-12-21 15:39:40 +00:00
63e8634567
move tar to docs folder
2021-12-21 15:26:49 +00:00
237bd8ab48
helm release
2021-12-21 15:12:28 +00:00
7abf272d6d
self host chart deploy
2021-12-21 15:05:43 +00:00
1488d466b3
remove traefik
2021-12-21 14:13:19 +00:00
6d808d126d
don't spin up nginx controller
2021-12-21 13:54:24 +00:00
abf952a743
avoid using tiller in helm
2021-12-21 13:36:47 +00:00
42ea628733
preprod helm setup
2021-12-21 12:06:31 +00:00
5eb2724e7f
using lerna version in preprod job
2021-12-20 09:33:54 +00:00
89ce9c8e88
preprod job for testing in isolation
2021-12-20 08:52:16 +00:00
2b5d1a105a
use standard values.yaml
2021-12-17 15:46:06 +01:00
e086859c7a
adding preprod deploy
2021-12-17 15:27:46 +01:00
44ea0dc0e3
yaml definition for release job
2021-12-17 15:02:25 +01:00
39116bc631
testing selfhost job
2021-12-17 14:58:03 +01:00
e9d44c7b47
turning on prod deploy again, adding github release to selfhost job
2021-12-16 19:24:07 +01:00
9f5bc94b17
use cross repo permissions token
2021-12-16 17:14:28 +01:00
32d18087b6
word count to verify production yaml
2021-12-16 16:04:08 +01:00
7ddfb51740
use github env rather than workflow outputs
2021-12-16 15:36:34 +01:00
40e9790e5e
set appVersion at correct level
2021-12-16 15:33:14 +01:00
8056c1acbb
adding run command to package chart
2021-12-16 15:15:00 +01:00
e2e91a7bd5
inputting correct release version
2021-12-16 14:31:40 +01:00
b04923d6d3
index helm repo
2021-12-16 14:17:36 +01:00
3a7bf6455e
workflow file
2021-12-16 13:40:17 +01:00
3a0dac4292
correct version for cloud deploy, added helm chart automation to selfhost job
2021-12-16 13:38:21 +01:00
414a1b74d4
adding AWS creds configuration step
2021-12-16 13:12:54 +01:00
6d22067f87
removing git commit sha from curl
2021-12-16 13:09:21 +01:00
d5ee373450
fix github curl to pull infra values.yaml
2021-12-16 13:01:43 +01:00
5c43042bf5
tag docker images, change eks deploy action
2021-12-16 12:44:11 +01:00
1a964f2122
turn off release pipeline, update selfhost jobs
2021-12-16 12:35:50 +01:00
dd8f33c548
remove leading v in job
2021-12-16 11:55:32 +01:00
d6a0a50c63
name values file correctly
2021-12-15 19:49:14 +01:00
a987047aa6
setup and update helm
2021-12-15 19:46:28 +01:00
4a4b8396e9
git add all
2021-12-15 19:41:55 +01:00
18dbfa911d
using tag correctly in selfhost pipeline
2021-12-15 19:40:59 +01:00
1cc2b98de5
split CI pipelines to improve speed and automate deployment to production through manual action
2021-12-15 18:43:12 +01:00
de7b9efea9
re-add helm release and configure
2021-12-13 19:25:53 +01:00
72e414aa71
don't run helm version script
2021-12-13 18:36:49 +01:00
e741834e83
adding separate helm release job
2021-12-13 17:30:12 +01:00
2751f9d4c4
adding and updating helm repos
2021-12-13 16:52:35 +01:00
e3615cc472
updating chart releaser CI
2021-12-13 13:49:02 +01:00
7334fc6748
automate helm deployment with CI
2021-12-09 11:05:43 +00:00
832a4e5262
adding budibase release version env var
2021-12-08 18:00:59 +00:00
5a614f33c3
CI Automation for helm chart release
2021-12-08 17:13:00 +00:00
7ff93e975a
completely automate helm chart incrementing and semver
2021-12-08 16:27:33 +00:00
fcef0a5bf9
git tree depth to fix self host tag fetching
2021-11-30 16:47:16 +01:00
0f0770af32
Merge branch 'master' of github.com:Budibase/budibase into develop
2021-11-25 12:21:58 +00:00
d5a5f4d227
adding version metadata to docker build
2021-11-22 18:25:57 +01:00
8a1a2c5305
Upgrading to Node 14 across the board as recent packages don't support 12 anymore.
2021-11-18 10:59:35 +00:00
b886bbfc47
Upgrading node version to 14 for some packages.
2021-11-17 19:39:08 +00:00
a3d79373db
Remove sentry dsn from build
2021-10-18 16:29:03 +01:00
e586b47c95
separate sentry projects to avoid noise
2021-10-14 16:22:53 +01:00
e6b5f6c18c
Update release-selfhost.yml
2021-10-14 14:33:27 +01:00
e1fe51a1b8
Merge branch 'develop' into dev-modes
2021-10-08 13:15:38 +01:00
5ffed2824e
Introduce dev modes, update contributor guide
2021-10-08 13:13:16 +01:00
1ae9a999fb
separate release and self host flows
2021-10-08 10:37:08 +01:00
c7a5b9eb71
updating workflow to push to self hosters
2021-10-07 23:08:21 +01:00
2bc54baee1
merge with develop
2021-09-21 20:30:18 +01:00
0a7512a4d9
changed events to constants, instantiated analytics client at right time
2021-09-21 20:21:15 +01:00
6472beb9b1
Update release.yml
2021-09-21 17:06:18 +01:00
aa3b13e5fb
make sure release is pointing to master
2021-09-21 16:39:45 +01:00
e53c212e60
updating CI in develop
2021-09-21 16:37:59 +01:00
184061a56b
analytics clients
2021-09-21 11:47:14 +01:00
518f8fd55e
merge develop into branch
2021-09-16 22:15:09 +02:00
4cb057d6ab
automate release tag in helm charts, remove superfluous build scripts
2021-08-24 16:58:10 +01:00
2d5cd7db23
move all the helm CI to the release pipeline
2021-08-19 07:53:17 +01:00
d811eb4e0d
use NPM script to run helm release
2021-08-18 18:42:22 +01:00
5843fa0286
test K8S CI
2021-08-18 18:09:40 +01:00
a0bba34664
testing chart releaser on CI pipeline
2021-08-18 14:55:22 +01:00
1af740fbf7
Helm chart CI automation
2021-08-16 21:47:08 +01:00
08bb1a1ef6
Create feature_request.md
2021-08-02 15:29:21 +01:00
5d362c4083
Rename staging release job to be more clear
2021-07-23 16:19:43 +01:00
fbbd070113
Remove docker push from main CI job in favour of release-develop
2021-07-23 16:17:05 +01:00
ff5e3ed94d
Update build:docker -> build:docker:develop
2021-07-23 10:02:12 +01:00
8a89c222ae
Add unique name to staging release bot
2021-07-23 09:44:03 +01:00
27946e5aae
Add lerna prereleases
2021-07-22 17:21:12 +01:00
a15bfb3f8b
Add global debug configs for single project debugging + readme instructions
2021-07-02 13:36:00 +01:00
e89ff94771
Merge pull request #1870 from Budibase/update-contributors
...
Add Peter and Rory as authors
2021-06-30 16:31:31 +01:00
3be016a3b8
Bootstrap before lint in release CI job
2021-06-29 17:37:58 +01:00
ceeb968531
Merge pull request #1871 from Budibase/develop
...
Develop
2021-06-29 14:48:27 +01:00
b5a8c188b5
Update CONTRIBUTING.md
2021-06-29 14:15:07 +01:00
f0933079a1
Add Peter and Rory as authors
2021-06-29 12:34:44 +01:00
4ea6c6cf01
Fixing workflow ordering for yarn lint and bootstrap.
2021-06-25 15:54:41 +01:00
9deeef2d9e
add develop tag and update docker push script
2021-06-21 16:25:12 +01:00
f198c2e108
ensuring PH and sentry configured correctly
2021-06-08 20:43:01 +01:00
4e97eea3c0
Fixing staging build so it only occurs on develop, master doesn't need it.
2021-06-07 18:04:16 +01:00
8585618736
configure AWS S3 credentials to upload standard components
2021-05-26 17:04:32 +01:00
88a35ecf81
automate npmrc step to keep scoped within CI
2021-05-26 16:48:03 +01:00
5c726e6d10
Update release.yml
2021-05-26 15:52:31 +01:00
399890fad9
auto release from NPM
2021-05-26 15:08:57 +01:00
71ee256cbf
Update release.yml
2021-05-21 09:11:56 +01:00
68e6823550
Update release.yml
2021-05-20 14:28:26 +01:00
3a422be071
simplify docker build before push
2021-05-20 13:54:18 +01:00
98496b4a01
Update release.yml
2021-05-20 13:00:07 +01:00
64e3b2a173
Update release.yml
2021-05-20 12:57:29 +01:00
23007a8597
prevent NPM publish in CI
2021-05-20 12:46:49 +01:00
f6f32b98ba
testing CI pipeline
2021-05-20 12:46:31 +01:00
bb560f7e22
Merge branch 'fix/onboarding' of https://github.com/Budibase/budibase into fix/onboarding
2021-05-20 12:38:18 +01:00
bb9d209a36
pipeline work
2021-05-20 12:38:12 +01:00
47fd393e89
@mjashanks has signed the CLA from Pull Request #1510
2021-05-20 08:14:22 +00:00
d7b33e6567
Editting the contributing doc to explain how to use Budibase after the single stack update.
2021-05-10 13:27:35 +01:00
2324e996d7
@kevmodrome has signed the CLA from Pull Request #1431
2021-05-01 05:28:10 +00:00
41e811d57c
@aptkingston has signed the CLA from Pull Request #1431
2021-04-30 17:37:54 +00:00
98b52e35c2
@mike12345567 has signed the CLA from Pull Request #1383
2021-04-14 16:20:20 +00:00
4d5b3c60a3
Creating file for storing CLA Signatures
2021-04-14 16:19:03 +00:00
55ce7367ae
cla - changes to corporate process
2021-04-13 16:41:22 +01:00
f2f640aca9
Contributor license agreement
...
licenses and new GitHub action
2021-04-13 14:43:33 +01:00
c02306e6fb
merge
2021-04-12 13:39:53 +01:00
00d6696b08
Update release.yml
2021-03-25 10:27:48 +00:00
ebce53e9ad
Update release.yml
2021-03-25 10:27:24 +00:00
69eacab7e1
Update release.yml
2021-03-24 15:30:15 +00:00
2685d46266
Update budibase_ci.yml
2021-03-15 12:12:19 +00:00
c76530e679
Update release.yml
2021-03-12 10:39:09 +00:00
d4bbb731fc
codecov GH action
2021-03-02 18:22:35 +00:00
58dde5f168
Update budibase_ci.yml
2021-02-12 10:49:54 +00:00
5f727d6913
Update budibase_ci.yml
2021-01-29 12:11:40 +00:00
1aa86f4bff
adding docker login command
2021-01-29 10:45:11 +00:00
c8b8ddb67f
add support for staging image that gets built on master push
2021-01-29 10:41:08 +00:00
ab9fc458ae
Update release.yml
2021-01-14 15:13:22 +00:00
bf50f9af89
Making sure docker image build only runs on linux and fixing syntax error.
2021-01-11 11:35:44 +00:00
3ec01a6fe5
Adding docker image release to release GH action.
2021-01-11 11:24:53 +00:00
538aa3b5cb
Update CONTRIBUTING.md
2020-12-01 11:20:39 +00:00
04716e47e7
Moving files to make README easier to reach in repo.
2020-12-01 10:57:33 +00:00
a705fd8667
typo
2020-11-11 09:47:56 +00:00
4c7740f7e5
config for windows signing cert
2020-11-11 09:45:21 +00:00
79cfc3e3c7
Update issue templates
2020-11-01 15:40:11 +00:00
9840585b90
Updating release process to also make use of Node 12.x
2020-09-22 10:49:34 +01:00
b5f42384e3
Updating GH actions to use Node 12 LTS to be inline with Node version used in Docker.
2020-09-22 10:12:17 +01:00
275a8e38a3
only build electron on releases
2020-09-14 17:02:42 +01:00
8efe88256d
Create ecs_deploy.yml ( #582 )
...
* Create ecs_deploy.yml
Adding a GitHub action for deploying our server every time there is a release. I'm currently building and pushing the docker image manually.
This should run every time we push a new release tag to the master branch.
* Update ecs_deploy.yml
* test that action works
* adding container name
* removing pull request testing trigger
2020-09-04 16:53:34 +01:00
9e00550eda
Cypress Tests Running in CI ( #524 )
...
* cypress test setup
* running cypress in CI
* fixing tests after first time setup wizard
* bb api key
* API Key in right place
* adding env in cypress.json
* env var in setup
* lint
* API key not working
* fill in API key form if present
* allow more time for creation
* cypress server for debug
* video recording, better debugging
* Adding debug logs
* set node env
* cypress env
* cancel irrelevant test
2020-08-05 15:18:28 +01:00
67c1b63443
Create stale.yml
2020-07-23 13:37:43 +01:00
22005bc990
formatting and tidy up
2020-07-14 16:00:58 +01:00
380781de8b
posthog analytics
2020-07-13 17:12:54 +01:00
703936f415
Update release.yml
2020-07-09 12:04:47 +01:00
ee139cd137
adding builder route for testing
2020-05-18 18:05:36 +01:00
34c8b1faf5
notarization and mac code signing through github CI
2020-05-15 16:06:53 +01:00
8a3d736fe2
Update release.yml
2020-05-15 14:39:27 +01:00
81902510c8
Update release.yml
2020-05-14 22:27:38 +01:00
4689142912
Update release.yml
2020-05-14 22:06:43 +01:00
d7df6d53c4
Update release.yml
2020-05-14 22:03:32 +01:00
65c2833886
Release ci ( #234 )
...
* adding budibase release workflow
* avoid NPM release step
2020-05-14 21:48:02 +01:00
f7e2012c89
add builds for windows and mac
2020-05-14 21:24:34 +01:00
014115c573
Making budibase downloadable, configuring CI to build executable bina… ( #233 )
...
Making budibase downloadable, configuring CI to build executable bina…
2020-05-14 21:18:36 +01:00
36250cbbdb
fix ci
2020-02-25 16:51:40 +00:00
5ff8b42faf
ci setup complete
2020-01-31 14:25:53 +00:00
adrinr
Gerard Burns
Rory Powell
Michael Drury
Martin McKeaveney
Jonny McCullagh
Martin McKeaveney
Mitch-Budibase
Andrew Kingston
NEOLPAR
Jonny McCullagh
Theone Eclarin
Martin McKeaveney
Martin McKeaveney
Maurits Lourens
Michael Drury
github-actions[bot]
Michael Shanks
Joe