From c88b3bd95473db4535558e8d0babeb77af79f314 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 6 Nov 2023 06:54:26 -0800 Subject: [PATCH 1/2] ci: correct default branch to 'main' --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 300fea60..e7da657f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: pull_request: merge_group: push: - branches: [master] + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.ref }} From f0023c893a306ace60496b268c7463a331e2dc01 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 6 Nov 2023 09:35:09 -0800 Subject: [PATCH 2/2] fix: agd continuing in default target --- upgrade-test-scripts/start_agd.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/upgrade-test-scripts/start_agd.sh b/upgrade-test-scripts/start_agd.sh index 5f620344..ecdd2092 100644 --- a/upgrade-test-scripts/start_agd.sh +++ b/upgrade-test-scripts/start_agd.sh @@ -8,4 +8,5 @@ source ./env_setup.sh export SLOGFILE=slog.slog -startAgd +# don't use startAgd() because that backgrounds +agd start --log_level warn "$@"