Skip to content

Commit

Permalink
fix: merge
Browse files Browse the repository at this point in the history
  • Loading branch information
wahtique committed Oct 10, 2023
1 parent 615a83a commit 32950df
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/scripts/validate-and-merge-cli.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/merge-dapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ scripts/.scala-build/
.vscode/*
.github/scripts/.bsp
Kleros_update_logs.txt
PR_comments.txt
PR_comments.txt
.bsp

0 comments on commit 32950df

Please sign in to comment.