toolshed/abra
4
4
Fork 23
Code Issues 82 Pull Requests 12 Packages Releases 45 Activity

feat(deploy): Simplifies deploy overview #508

Merged
p4u1 merged 1 commits from (deleted):fixes into main 2025-03-12 16:13:25 +00:00
Conversation 8 Commits 1 Files Changed 23
+263 -641
p4u1 commented 2025-03-04 09:26:14 +00:00
Owner
Copy Link
Copy Source
No description provided.
p4u1 force-pushed fixes from 50b7ec550a to 3c6b506114 2025-03-04 09:36:09 +00:00 Compare
p4u1 reviewed 2025-03-04 09:39:59 +00:00
cli/app/deploy.go Outdated
@@ -303,6 +303,7 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App
if err != nil {
return "", "", err
}
// TODO: This seems wrong!?
p4u1 commented 2025-03-04 09:39:59 +00:00
Author
Owner
Copy Link
Copy Source

@decentral1se This seems wrong? Can we just omit CHAOS in the deploy overview?
The VERSION then shows one of the following:

  • tag: v1.0.0
  • commit: eebbcc
  • chaos commit: eebbcc+U

This is all the info we need right? Or am I missing something?

@decentral1se This seems wrong? Can we just omit CHAOS in the deploy overview? The VERSION then shows one of the following: - tag: `v1.0.0` - commit: `eebbcc` - chaos commit: `eebbcc+U` This is all the info we need right? Or am I missing something?
decentral1se commented 2025-03-04 12:08:21 +00:00
Owner
Copy Link
Copy Source

@p4u1 I'm not exactly sure but I think you're right from what you've included. I'd have to see how many tests fail 😂 Sure keep going and see where it leads you?

@p4u1 I'm not exactly sure but I think you're right from what you've included. I'd have to see how many tests fail 😂 Sure keep going and see where it leads you?
👍 1
decentral1se reviewed 2025-03-04 12:08:32 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

💕

💕
.drone.yml Outdated
@@ -77,12 +77,6 @@ steps:
wget https://git.coopcloud.tech/toolshed/abra/raw/branch/main/scripts/tests/run-ci-int -O run-ci-int
chmod +x run-ci-int
sh run-ci-int
when:
decentral1se commented 2025-03-04 11:26:50 +00:00
Owner
Copy Link
Copy Source

The test suite runs for like 30 mins, I think this would waste a lot of computing cycles. Also, people push commits to main for stuff that doesn't need testing and forget to put [ci skip]. I think this might cause more problems than it solves tbh. Nightly seems to be fine so far? Do you have some other needs here? I think the CI failure is cus the secret which contains the SSH key is locked to only run on the main branch?

The test suite runs for like 30 mins, I think this would waste a lot of computing cycles. Also, people push commits to main for stuff that doesn't need testing and forget to put `[ci skip]`. I think this might cause more problems than it solves tbh. Nightly seems to be fine so far? Do you have some other needs here? I think the CI failure is cus the secret which contains the SSH key is locked to only run on the main branch?
p4u1 commented 2025-03-04 12:49:28 +00:00
Author
Owner
Copy Link
Copy Source

There are not a lot of pull requests currently so I would really prefer getting direct feedback in my pull request (waiting 30 minutes is not a problem) instead of waiting for the next day and having to remember to look into drone logs.
Maybe as a compromise we could add a special label which triggers integration tests for that pr? Would need some help with that though (never really worked with drone bevore)

There are not a lot of pull requests currently so I would really prefer getting direct feedback in my pull request (waiting 30 minutes is not a problem) instead of waiting for the next day and having to remember to look into drone logs. Maybe as a compromise we could add a special label which triggers integration tests for that pr? Would need some help with that though (never really worked with drone bevore)
decentral1se commented 2025-03-04 15:25:10 +00:00
Owner
Copy Link
Copy Source

Sounds good yeh!

OK, I'll try to wire this up, I can't quite remember what is involved but I'll try to get it done in the next days.

What branch name do you want? @p4u1

So then we do nightly runs and on-demand on a specific branch for quick feedback?

Sounds good yeh! OK, I'll try to wire this up, I can't quite remember what is involved but I'll try to get it done in the next days. What branch name do you want? @p4u1 So then we do nightly runs and on-demand on a specific branch for quick feedback?
decentral1se commented 2025-03-10 13:01:49 +00:00
Owner
Copy Link
Copy Source

Sorry, I'm just not finding time to do this @p4u1, I would say: please open a ticket so I can come back to this when I have time.

Sorry, I'm just not finding time to do this @p4u1, I would say: please open a ticket so I can come back to this when I have time.
p4u1 commented 2025-03-06 19:16:05 +00:00
Author
Owner
Copy Link
Copy Source

Proposal for new Deploy Overview:

┃ CURRENT DEPLOYMENT ┃
┃ VERSION unknown
┃
┃ ┃
┃ CURRENT ENV ┃
┃ VERSION ff2c04c9+U ┃
┃ ┃
┃ NEW DEPLOYMENT ┃
┃ VERSION 1.0.0 ┃

Then "version" can be:

  • version: 1.0.2
  • commit: dd2c04c9
  • chaos commit: dd2c04c9+U

@decentral1se how do you feel about omitting all those CHAOS fields

**Proposal for new Deploy Overview:** ┃ CURRENT DEPLOYMENT ┃ ┃ VERSION unknown ┃ ┃ ┃ ┃ CURRENT ENV ┃ ┃ VERSION ff2c04c9+U ┃ ┃ ┃ ┃ NEW DEPLOYMENT ┃ ┃ VERSION 1.0.0 ┃ Then "version" can be: - version: 1.0.2 - commit: dd2c04c9 - chaos commit: dd2c04c9+U @decentral1se how do you feel about omitting all those CHAOS fields
decentral1se commented 2025-03-06 23:36:02 +00:00
Owner
Copy Link
Copy Source

@decentral1se how do you feel about omitting all those CHAOS fields

Yeh I'm all for it. Nice to simplify here.

> @decentral1se how do you feel about omitting all those CHAOS fields Yeh I'm all for it. Nice to simplify here.
p4u1 commented 2025-03-07 14:21:44 +00:00
Author
Owner
Copy Link
Copy Source
  • app_check.bats
  • app_cmd.bats
  • app_config.bats
  • app_cp.bats
  • app_deploy.bats
  • app_deploy_env_version.bats
  • app_deploy_overview.bats
  • app_deploy_remote_recipes.bats
  • app_env.bats
  • app_env_version.bats
  • app_labels.bats
  • app_list.bats
  • app_logs.bats
  • app_new.bats
  • app_ps.bats
  • app_remove.bats
  • app_restart.bats
  • app_rollback.bats
  • app_rollback_env_version.bats
  • app_rollback_overview.bats
  • app_run.bats
  • app_secret.bats
  • app_secret_env_version.bats
  • app_services.bats
  • app_undeploy.bats
  • app_undeploy_env_version.bats
  • app_undeploy_overview.bats
  • app_upgrade.bats
  • app_upgrade_env_version.bats
  • app_upgrade_overview.bats
  • app_volume.bats
- [x] app_check.bats - [x] app_cmd.bats - [x] app_config.bats - [x] app_cp.bats - [x] app_deploy.bats - [x] app_deploy_env_version.bats - [x] app_deploy_overview.bats - [x] app_deploy_remote_recipes.bats - [x] app_env.bats - [x] app_env_version.bats - [x] app_labels.bats - [x] app_list.bats - [x] app_logs.bats - [x] app_new.bats - [x] app_ps.bats - [x] app_remove.bats - [x] app_restart.bats - [x] app_rollback.bats - [x] app_rollback_env_version.bats - [x] app_rollback_overview.bats - [x] app_run.bats - [x] app_secret.bats - [x] app_secret_env_version.bats - [x] app_services.bats - [x] app_undeploy.bats - [x] app_undeploy_env_version.bats - [x] app_undeploy_overview.bats - [x] app_upgrade.bats - [x] app_upgrade_env_version.bats - [x] app_upgrade_overview.bats - [x] app_volume.bats
p4u1 force-pushed fixes from 7f40394aff to 632d27cc25 2025-03-09 11:53:49 +00:00 Compare
p4u1 force-pushed fixes from 632d27cc25 to 60ae6091e5 2025-03-09 12:02:39 +00:00 Compare
p4u1 changed title from fixes to feat(deploy): Simplifies deploy overview 2025-03-09 12:27:23 +00:00
p4u1 commented 2025-03-09 12:27:33 +00:00
Author
Owner
Copy Link
Copy Source

@decentral1se this is ready for review

@decentral1se this is ready for review
p4u1 force-pushed fixes from 60ae6091e5 to fe37166733 2025-03-09 12:33:15 +00:00 Compare
decentral1se reviewed 2025-03-10 13:03:41 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

Great stuff! Hard diff to review, I guess if the integration suite is saying ✅ then I'm good 🙃

We can also see how things go in the RC2.

I'm very short on time, please proceed as you think is best!

(If you don't have time to run the suite yourself, just merge and see what happens)

Great stuff! Hard diff to review, I guess if the integration suite is saying ✅ then I'm good 🙃 We can also see how things go in the RC2. I'm very short on time, please proceed as you think is best! (If you don't have time to run the suite yourself, just merge and see what happens)
p4u1 merged commit e58a716fe1 into main 2025-03-12 16:13:25 +00:00
p4u1 deleted branch fixes 2025-03-12 16:13:25 +00:00
p4u1 commented 2025-03-12 16:14:01 +00:00
Author
Owner
Copy Link
Copy Source

Ok I merged it, lets hope for green ci tomorrow, but should be fine (I tested most of it locally).

Ok I merged it, lets hope for green ci tomorrow, but should be fine (I tested most of it locally).
🎉 1
Sign in to join this conversation.
Reviewers
No Reviewers
p4u1
decentral1se
Labels
Clear labels
bug
Something is not working
 build
go build related issues
 ci/cd
Building things with CI/CD
 critical fix
https://docs.coopcloud.tech/federation/resolutions/passed/010/
 design
UI/UX
 documentation
Documenting all the things
 duplicate
This issue or pull request already exists
 easy-first-issue
Something for new people to get stuck into. We hope it's easy!
 enhancement
New feature
 help wanted
Need some help
 i10n
Everything to do with localisation
 i18n
Everything to do with internationalisation
 installer
Everything to do with the install script.
 invalid
Something is wrong
 question
More information is needed
 release
Release management
 release-candidate
Related to the new release candidate
 security
Security related
 tech-debt
test
Unit/integration testing
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm BornDeleuze Brooke carla cas (Cassowary) coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) iexos jade (Jade Ambrose) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) moosemower moritz notplants oxaliq (sorrel) p4u1 pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) renovate-bot (Comrade Renovate Bot) ripclap simon sixsmith (Sixsmith) stevensting trav (Trav Fryer) val (val (he/him)) yksflip
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: toolshed/abra#508