From 32950df0fce1f4ebab77a8fdfd17ccb4fe9c36c5 Mon Sep 17 00:00:00 2001
From: William Veal Phan <william.veal-phan@ledger.fr>
Date: Tue, 10 Oct 2023 16:55:47 +0200
Subject: [PATCH] fix: merge

---
 .github/scripts/validate-and-merge-cli.scala | 12 ++++++------
 .github/workflows/merge-dapp.yml             |  1 +
 .gitignore                                   |  3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/validate-and-merge-cli.scala b/.github/scripts/validate-and-merge-cli.scala
index aaa2baa..c4ce86a 100644
--- a/.github/scripts/validate-and-merge-cli.scala
+++ b/.github/scripts/validate-and-merge-cli.scala
@@ -1,10 +1,10 @@
 // Description: Validate and merge the CLI
-//> using scala "3.3.1"
-//> using repository "https://NOBODY:${{ GITHUB_TOKEN }}@maven.pkg.github.com/LedgerHQ/_"
-//> using lib "io.circe::circe-generic:0.14.6"
-//> using lib "io.circe::circe-parser:0.14.6"
-//> using lib "com.lihaoyi::os-lib:0.9.1"
-//> using lib "co.ledger::backend-commons-circe:3.1.1"
+//> using scala "3.3.0"
+//> using repository "https://maven.pkg.github.com/LedgerHQ/_"
+//> using lib "io.circe::circe-generic:0.14.3"
+//> using lib "io.circe::circe-parser:0.14.3"
+//> using lib "com.lihaoyi::os-lib:0.9.0"
+//> using lib "co.ledger::backend-commons-circe:1.7.1"
 
 import os.*
 import language.deprecated.symbolLiterals
diff --git a/.github/workflows/merge-dapp.yml b/.github/workflows/merge-dapp.yml
index fa386f5..4b14883 100644
--- a/.github/workflows/merge-dapp.yml
+++ b/.github/workflows/merge-dapp.yml
@@ -36,6 +36,7 @@ jobs:
         #
         run: |
           perl -i -pe 's/{{ GITHUB_TOKEN }}/$ENV{GITHUB_TOKEN}/' .github/scripts/validate-and-merge-cli.scala
+          scala-cli --power config github.token "env:GITHUB_TOKEN"
           scala-cli .github/scripts/validate-and-merge-cli.scala --main-class main -- all-dapp-allowlist.json
 
       - name: Commit and push merged list
diff --git a/.gitignore b/.gitignore
index 7509be2..d3a47d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ scripts/.scala-build/
 .vscode/*
 .github/scripts/.bsp
 Kleros_update_logs.txt
-PR_comments.txt
\ No newline at end of file
+PR_comments.txt
+.bsp