From 8ba2e3a7764b11628d51e8d66b9c8024bf088f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:05:06 +0200 Subject: [PATCH 1/7] Update deploy.yml --- .github/workflows/deploy.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e27785c..86e0895 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,25 +8,30 @@ jobs: deploy: runs-on: self-hosted steps: - - name: Checkout repo - uses: actions/checkout@v3 - - name: Set deployment path id: set-path run: | if [ "${GITHUB_REF_NAME}" = "main" ]; then - echo "DEPLOY_PATH=/share/discord-bot-dev" >> $GITHUB_ENV + echo "DEPLOY_PATH=/share/discord-bot-prod" >> $GITHUB_ENV elif [ "${GITHUB_REF_NAME}" = "dev" ]; then - echo "DEPLOY_PATH=/share/CACHEDEV1_DATA/discord-bot-prod" >> $GITHUB_ENV + echo "DEPLOY_PATH=/share/discord-bot-dev" >> $GITHUB_ENV else echo "Unsupported branch" exit 1 fi - - name: Deploy bot + - name: Update bot files + run: | + if [ ! -d "$DEPLOY_PATH/.git" ]; then + git clone -b $GITHUB_REF_NAME https://github.com/ArcElewyn/Discord.git $DEPLOY_PATH + else + cd $DEPLOY_PATH + git fetch origin $GITHUB_REF_NAME + git reset --hard origin/$GITHUB_REF_NAME + fi + + - name: Restart bot run: | cd $DEPLOY_PATH - git fetch origin $GITHUB_REF_NAME - git reset --hard origin/$GITHUB_REF_NAME docker compose down || true docker compose up --build -d From 5226a5102cf92776d6b42144ff0960bdc5572de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:06:33 +0200 Subject: [PATCH 2/7] Update deploy.yml --- .github/workflows/deploy.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 86e0895..bb6115a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,10 +22,13 @@ jobs: - name: Update bot files run: | - if [ ! -d "$DEPLOY_PATH/.git" ]; then - git clone -b $GITHUB_REF_NAME https://github.com/ArcElewyn/Discord.git $DEPLOY_PATH + cd $DEPLOY_PATH + if [ ! -d ".git" ]; then + git init + git remote add origin https://github.com/ArcElewyn/Discord.git + git fetch origin $GITHUB_REF_NAME + git reset --hard origin/$GITHUB_REF_NAME else - cd $DEPLOY_PATH git fetch origin $GITHUB_REF_NAME git reset --hard origin/$GITHUB_REF_NAME fi From c5e09243fa30fcca291f4acd77eea5d33731927b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:07:53 +0200 Subject: [PATCH 3/7] Update deploy.yml --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bb6115a..2b5bae0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,6 +22,7 @@ jobs: - name: Update bot files run: | + git config --global --add safe.directory $DEPLOY_PATH cd $DEPLOY_PATH if [ ! -d ".git" ]; then git init From c391e91149177691be6053675ef19cc5f136d050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:09:36 +0200 Subject: [PATCH 4/7] Update deploy.yml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2b5bae0..8b8c6f3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,21 +18,21 @@ jobs: else echo "Unsupported branch" exit 1 - fi - name: Update bot files + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # token automatique fourni par GitHub run: | git config --global --add safe.directory $DEPLOY_PATH cd $DEPLOY_PATH if [ ! -d ".git" ]; then git init - git remote add origin https://github.com/ArcElewyn/Discord.git + git remote add origin https://x-access-token:$GITHUB_TOKEN@github.com/ArcElewyn/Discord.git git fetch origin $GITHUB_REF_NAME git reset --hard origin/$GITHUB_REF_NAME else git fetch origin $GITHUB_REF_NAME git reset --hard origin/$GITHUB_REF_NAME - fi - name: Restart bot run: | From 43581a42b74874a0b522054904b9cf1dc7d0f400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:11:08 +0200 Subject: [PATCH 5/7] correction du if dans Set deployment path --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b8c6f3..6cfaed9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,6 +18,7 @@ jobs: else echo "Unsupported branch" exit 1 + fi - name: Update bot files env: From 49bfe40507d64d56b8357f6aca9c771f5359e3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:12:15 +0200 Subject: [PATCH 6/7] Update deploy.yml --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6cfaed9..eacff57 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: - name: Update bot files env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # token automatique fourni par GitHub + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config --global --add safe.directory $DEPLOY_PATH cd $DEPLOY_PATH @@ -34,6 +34,7 @@ jobs: else git fetch origin $GITHUB_REF_NAME git reset --hard origin/$GITHUB_REF_NAME + fi - name: Restart bot run: | From 1177f770c5884049876aaa15546fc506e0e3e345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= <159157671+ArcElewyn@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:13:22 +0200 Subject: [PATCH 7/7] Update deploy.yml --- .github/workflows/deploy.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index eacff57..7c52955 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,13 +28,12 @@ jobs: cd $DEPLOY_PATH if [ ! -d ".git" ]; then git init - git remote add origin https://x-access-token:$GITHUB_TOKEN@github.com/ArcElewyn/Discord.git - git fetch origin $GITHUB_REF_NAME - git reset --hard origin/$GITHUB_REF_NAME else - git fetch origin $GITHUB_REF_NAME - git reset --hard origin/$GITHUB_REF_NAME + git remote remove origin || true fi + git remote add origin https://x-access-token:$GITHUB_TOKEN@github.com/ArcElewyn/Discord.git + git fetch origin $GITHUB_REF_NAME + git reset --hard origin/$GITHUB_REF_NAME - name: Restart bot run: |