From 9ce0426b7ebd541b0a0053746bcb4359d1df3fb1 Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Thu, 11 Apr 2024 15:39:56 -0300 Subject: [PATCH 1/4] feat: force push to staging inbox --- .gitea/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 2acf65ba..79c3907d 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -29,6 +29,7 @@ jobs: if: github.ref == 'refs/heads/dev' uses: dokku/github-action@master with: - branch: 'dev' + branch: 'main' git_remote_url: 'ssh://dokku@staging.discours.io:22/core' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} + push_flags: '--force' From dce4d777068074daabc2a8ddb8b3857b2deb68a1 Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Thu, 11 Apr 2024 16:11:17 -0300 Subject: [PATCH 2/4] feat: fore push dev to staging --- .gitea/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 79c3907d..df04822b 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -32,4 +32,4 @@ jobs: branch: 'main' git_remote_url: 'ssh://dokku@staging.discours.io:22/core' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} - push_flags: '--force' + git_push_flags: '--force' From 52280c29ea949758279ffd7e7894949d37f9aff5 Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Thu, 11 Apr 2024 16:12:11 -0300 Subject: [PATCH 3/4] feat: fore push dev to staging --- .gitea/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index df04822b..15385047 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -29,7 +29,7 @@ jobs: if: github.ref == 'refs/heads/dev' uses: dokku/github-action@master with: - branch: 'main' + branch: 'dev' git_remote_url: 'ssh://dokku@staging.discours.io:22/core' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} git_push_flags: '--force' From 994cd05d85ba693d0261a6f491a55e4ae68b1709 Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Thu, 11 Apr 2024 16:14:26 -0300 Subject: [PATCH 4/4] feat: no fore push dev to staging --- .gitea/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 15385047..2acf65ba 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -32,4 +32,3 @@ jobs: branch: 'dev' git_remote_url: 'ssh://dokku@staging.discours.io:22/core' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} - git_push_flags: '--force'