From cd6a9fd49371476d813e892956e2e920fcc3fb7e Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Thu, 23 Mar 2023 22:44:49 -0400 Subject: [PATCH 1/2] Update update-main-version.yml --- .github/workflows/update-main-version.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update-main-version.yml b/.github/workflows/update-main-version.yml index c1e046ace..9e2b966d7 100644 --- a/.github/workflows/update-main-version.yml +++ b/.github/workflows/update-main-version.yml @@ -1,5 +1,5 @@ name: Update Main Version -run-name: Move ${{ github.event.inputs.main_version }} to ${{ github.event.inputs.target }} +run-name: Move ${{ github.event.inputs.major_version }} to ${{ github.event.inputs.target }} on: workflow_dispatch: @@ -7,11 +7,12 @@ on: target: description: The tag or reference to use required: true - main_version: + major_version: type: choice - description: The main version to update + description: The major version to update options: - v3 + - v2 jobs: tag: @@ -25,6 +26,6 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com - name: Tag new target - run: git tag -f ${{ github.event.inputs.main_version }} ${{ github.event.inputs.target }} + run: git tag -f ${{ github.event.inputs.major_version }} ${{ github.event.inputs.target }} - name: Push new tag - run: git push origin ${{ github.event.inputs.main_version }} --force + run: git push origin ${{ github.event.inputs.major_version }} --force From 8f4b7f84864484a7bf31766abe9204da3cbe65b3 Mon Sep 17 00:00:00 2001 From: Cameron Booth Date: Thu, 23 Mar 2023 22:34:48 -0700 Subject: [PATCH 2/2] Add new public key for known_hosts (#1237) * Add new public key for known_hosts * Fix the build! --- dist/index.js | 2 +- src/git-auth-helper.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 79d59134d..8fca2b4c0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -330,7 +330,7 @@ class GitAuthHelper { if (this.settings.sshKnownHosts) { knownHosts += `# Begin from input known hosts\n${this.settings.sshKnownHosts}\n# end from input known hosts\n`; } - knownHosts += `# Begin implicitly added github.com\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==\n# End implicitly added github.com\n`; + knownHosts += `# Begin implicitly added github.com\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=\n# End implicitly added github.com\n`; this.sshKnownHostsPath = path.join(runnerTemp, `${uniqueId}_known_hosts`); stateHelper.setSshKnownHostsPath(this.sshKnownHostsPath); yield fs.promises.writeFile(this.sshKnownHostsPath, knownHosts); diff --git a/src/git-auth-helper.ts b/src/git-auth-helper.ts index 6e3ad2897..364a04ee8 100644 --- a/src/git-auth-helper.ts +++ b/src/git-auth-helper.ts @@ -247,7 +247,7 @@ class GitAuthHelper { if (this.settings.sshKnownHosts) { knownHosts += `# Begin from input known hosts\n${this.settings.sshKnownHosts}\n# end from input known hosts\n` } - knownHosts += `# Begin implicitly added github.com\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==\n# End implicitly added github.com\n` + knownHosts += `# Begin implicitly added github.com\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=\n# End implicitly added github.com\n` this.sshKnownHostsPath = path.join(runnerTemp, `${uniqueId}_known_hosts`) stateHelper.setSshKnownHostsPath(this.sshKnownHostsPath) await fs.promises.writeFile(this.sshKnownHostsPath, knownHosts)