From 2d642e31ea0adac7d272d1af812a493266a56b3c Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Fri, 2 Jun 2023 15:16:25 -0700 Subject: [PATCH 1/2] Branch protection --- .vscode/settings.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3f10569..6d7b99e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,11 @@ "javascript.validate.enable": false, "files.trimTrailingWhitespace": true, "editor.insertSpaces": false, - "editor.tabSize": 4 + "editor.tabSize": 4, + + "git.branchProtection": [ + "main", + ], + "git.branchProtectionPrompt": "alwaysCommitToNewBranch", + "git.branchRandomName.enable": true } \ No newline at end of file From 3a2663e489c9f0756d1fadb4005e2eff6a199fc3 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Fri, 2 Jun 2023 15:16:33 -0700 Subject: [PATCH 2/2] Enable CI in PRs --- ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci.yml b/ci.yml index 8663d7d..633ad84 100644 --- a/ci.yml +++ b/ci.yml @@ -5,7 +5,8 @@ trigger: include: - main -pr: none +pr: + - main resources: repositories: @@ -31,7 +32,7 @@ extends: parameters: npmPackages: - ${{ each package in parameters.runOnPackages }}: - - name: ${{ package }} + - name: ${{ package }} ghCreateTag: false buildSteps: - script: npm ci