From 34a663b4d126e9c5801828fbbb0649a891347b24 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sat, 28 Aug 2021 15:55:07 +0000 Subject: [PATCH 1/3] feat(vscode): add extensions config --- .vscode/extensions.json | 10 ++++++++++ .vscode/settings.json | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..89b5f1bb --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,10 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations. + // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp + + // List of extensions which should be recommended for users of this workspace. + "recommendations": [ + "bmewburn.vscode-intelephense-client", + "imperez.smarty" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..252ca6e1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "*.tpl": "smarty" + } +} \ No newline at end of file From eb6e864f34e5edfbfca472069d8cf636874cbe36 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sat, 28 Aug 2021 15:57:07 +0000 Subject: [PATCH 2/3] fix(ci): use bot GitHub token so forks can deploy --- .github/workflows/k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/k8s-deploy.yml b/.github/workflows/k8s-deploy.yml index 7a3e557f..1f3981d3 100644 --- a/.github/workflows/k8s-deploy.yml +++ b/.github/workflows/k8s-deploy.yml @@ -8,7 +8,7 @@ on: branches: [ develop ] env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} DOCKER_REGISTRY: ghcr.io DOCKER_PACKAGE: site-composite From 3cef926ea2a483c023f23ef75c2cb20c17b52ce1 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sat, 28 Aug 2021 16:01:35 +0000 Subject: [PATCH 3/3] Revert "fix(ci): use bot GitHub token so forks can deploy" This reverts commit eb6e864f34e5edfbfca472069d8cf636874cbe36. --- .github/workflows/k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/k8s-deploy.yml b/.github/workflows/k8s-deploy.yml index 1f3981d3..7a3e557f 100644 --- a/.github/workflows/k8s-deploy.yml +++ b/.github/workflows/k8s-deploy.yml @@ -8,7 +8,7 @@ on: branches: [ develop ] env: - GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_REGISTRY: ghcr.io DOCKER_PACKAGE: site-composite