From 7ad3665e36ad3c297fe860480dd42202d59f54a9 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 22 Mar 2024 10:15:32 +0100 Subject: [PATCH 1/2] fix ci --- .woodpecker/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml index b163295..2a80f9e 100644 --- a/.woodpecker/deploy.yml +++ b/.woodpecker/deploy.yml @@ -15,9 +15,9 @@ steps: commands: - cd "/builds/$CI_COMMIT_SHA" - mkdir "$HOME/.ssh" - - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519" + - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_rsa" - chmod 700 "$HOME/.ssh" - - chmod 600 "$HOME/.ssh/id_ed25519" + - chmod 600 "$HOME/.ssh/id_rsa" - cp .mage.yml.dist .mage.yml - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml From 6b0fd815d35449bd9fe3b9c9c74004df70f2b342 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 29 Mar 2024 12:38:51 +0100 Subject: [PATCH 2/2] update mage conf --- .mage.yml.dist | 9 ++------- .woodpecker/deploy.yml | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.mage.yml.dist b/.mage.yml.dist index c181f6f..ad22570 100644 --- a/.mage.yml.dist +++ b/.mage.yml.dist @@ -8,16 +8,11 @@ magephp: rsync: '-avz --delete' exclude: - "/.git" - - "*.swp" - - "*.swo" - "/.env.local" - - "/data" - - "/migrations/*" + - "/migrations/" - "/public/uploads/" - "/public/files/" - - "/var/cache/*" - - "/var/log/*" - - "/var/data.db" + - "/var/" - "/public/js/fos_js_routes.json" - "/public/build" - "/public/media" diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml index 2a80f9e..4bd5839 100644 --- a/.woodpecker/deploy.yml +++ b/.woodpecker/deploy.yml @@ -21,5 +21,4 @@ steps: - cp .mage.yml.dist .mage.yml - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml - - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml - mage deploy "$CI_PIPELINE_DEPLOY_TARGET"