ci: fix conflict

openfoodfacts · Dec 12, 2023 · aa7c42a · aa7c42a
1 parent 06506cf
commit aa7c42a
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml
@@ -221,19 +221,10 @@ jobs:
             cd ${{ matrix.env }}
             docker system prune -af
 
-      - uses: frankie567/[email protected]
+      - uses: basos9/[email protected]
         if: ${{ always() }}
         with:
           apiHost: https://grafana.openfoodfacts.org
           apiToken: ${{ secrets.GRAFANA_API_TOKEN }}
           text: <a href="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}">Deployment ${{ steps.livecheck.outcome }} on ${{ matrix.env }}</a>
           tags: type:deployment,origin:github,status:${{ steps.livecheck.outcome }},repo:${{ github.repository }},sha:${{ github.sha }},app:taxonomy-editor,env:${{ matrix.env }}
-=======
-    - uses: basos9/[email protected]
-      if: ${{ always() }}
-      with:
-        apiHost: https://grafana.openfoodfacts.org
-        apiToken: ${{ secrets.GRAFANA_API_TOKEN }}
-        text: <a href="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}">Deployment ${{ steps.livecheck.outcome }} on ${{ matrix.env }}</a>
-        tags: type:deployment,origin:github,status:${{ steps.livecheck.outcome }},repo:${{ github.repository }},sha:${{ github.sha }},app:taxonomy-editor,env:${{ matrix.env }}
->>>>>>> Stashed changes