From fa52290868a016cb8ee2eb0b81d31af3c540b269 Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Wed, 21 Dec 2022 10:09:34 -0800 Subject: [PATCH 1/4] Use setup-rust/audit action for Rust audit jobs See: - https://github.com/artichoke/setup-rust/pull/17 --- .../audit-workflow-node-ruby-rust.yaml | 19 ++----------------- .../templates/audit-workflow-ruby-rust.yaml | 19 ++----------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/github-org-artichoke/templates/audit-workflow-node-ruby-rust.yaml b/github-org-artichoke/templates/audit-workflow-node-ruby-rust.yaml index ef4e216b..f7a1b567 100644 --- a/github-org-artichoke/templates/audit-workflow-node-ruby-rust.yaml +++ b/github-org-artichoke/templates/audit-workflow-node-ruby-rust.yaml @@ -58,27 +58,12 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - run: | - echo "::group::rustup toolchain install" - rustup toolchain install stable --profile minimal - echo "::endgroup::" - echo "::group::set default toolchain" - rustup default stable - echo "::endgroup::" - echo "::group::rustup version" - rustup -Vv - echo "::endgroup::" - echo "::group::rustc version" - rustc -Vv - echo "::endgroup::" - echo "::group::cargo version" - cargo version --verbose - echo "::endgroup::" + uses: artichoke/setup-rust/audit@v1 - name: Generate Cargo.lock run: | if [[ ! -f "Cargo.lock" ]]; then - cargo +stable generate-lockfile --verbose + cargo generate-lockfile --verbose fi - uses: EmbarkStudios/cargo-deny-action@v1 diff --git a/github-org-artichoke/templates/audit-workflow-ruby-rust.yaml b/github-org-artichoke/templates/audit-workflow-ruby-rust.yaml index 91f3534d..11a3d119 100644 --- a/github-org-artichoke/templates/audit-workflow-ruby-rust.yaml +++ b/github-org-artichoke/templates/audit-workflow-ruby-rust.yaml @@ -44,27 +44,12 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - run: | - echo "::group::rustup toolchain install" - rustup toolchain install stable --profile minimal - echo "::endgroup::" - echo "::group::set default toolchain" - rustup default stable - echo "::endgroup::" - echo "::group::rustup version" - rustup -Vv - echo "::endgroup::" - echo "::group::rustc version" - rustc -Vv - echo "::endgroup::" - echo "::group::cargo version" - cargo version --verbose - echo "::endgroup::" + uses: artichoke/setup-rust/audit@v1 - name: Generate Cargo.lock run: | if [[ ! -f "Cargo.lock" ]]; then - cargo +stable generate-lockfile --verbose + cargo generate-lockfile --verbose fi - uses: EmbarkStudios/cargo-deny-action@v1 From 1133e07f8ead410ee7870416c2cb515277eb332a Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Wed, 21 Dec 2022 10:17:50 -0800 Subject: [PATCH 2/4] deploy updates to audit workflows --- .../repository_file_github_actions_audit_workflow.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github-org-artichoke/repository_file_github_actions_audit_workflow.tf b/github-org-artichoke/repository_file_github_actions_audit_workflow.tf index 9cdf250e..3e9a5a5e 100644 --- a/github-org-artichoke/repository_file_github_actions_audit_workflow.tf +++ b/github-org-artichoke/repository_file_github_actions_audit_workflow.tf @@ -24,7 +24,7 @@ locals { "rubyconf", // https://github.com/artichoke/rubyconf ] - force_bump_audit_ruby_rust = false + force_bump_audit_ruby_rust = true audit_ruby_rust_repos = [ "artichoke", // https://github.com/artichoke/artichoke "boba", // https://github.com/artichoke/boba @@ -41,7 +41,7 @@ locals { "strudel", // https://github.com/artichoke/strudel ] - force_bump_audit_node_ruby_rust = false + force_bump_audit_node_ruby_rust = true audit_node_ruby_rust_repos = [ "playground", // https://github.com/artichoke/playground ] From f51888468b25821ea8650327e52153521e7d39d7 Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Wed, 21 Dec 2022 10:45:04 -0800 Subject: [PATCH 3/4] PRs are deployed for Rust audit jobs --- .../repository_file_github_actions_audit_workflow.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github-org-artichoke/repository_file_github_actions_audit_workflow.tf b/github-org-artichoke/repository_file_github_actions_audit_workflow.tf index 3e9a5a5e..9cdf250e 100644 --- a/github-org-artichoke/repository_file_github_actions_audit_workflow.tf +++ b/github-org-artichoke/repository_file_github_actions_audit_workflow.tf @@ -24,7 +24,7 @@ locals { "rubyconf", // https://github.com/artichoke/rubyconf ] - force_bump_audit_ruby_rust = true + force_bump_audit_ruby_rust = false audit_ruby_rust_repos = [ "artichoke", // https://github.com/artichoke/artichoke "boba", // https://github.com/artichoke/boba @@ -41,7 +41,7 @@ locals { "strudel", // https://github.com/artichoke/strudel ] - force_bump_audit_node_ruby_rust = true + force_bump_audit_node_ruby_rust = false audit_node_ruby_rust_repos = [ "playground", // https://github.com/artichoke/playground ] From 6f8f01300825f030d06a5969c820e476ec0f61e4 Mon Sep 17 00:00:00 2001 From: Ryan Lopopolo Date: Wed, 21 Dec 2022 10:49:04 -0800 Subject: [PATCH 4/4] Fix duplicate slash in URL for github repository file update branch href --- modules/update-github-repository-file/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/update-github-repository-file/outputs.tf b/modules/update-github-repository-file/outputs.tf index b752b5ea..d231282d 100644 --- a/modules/update-github-repository-file/outputs.tf +++ b/modules/update-github-repository-file/outputs.tf @@ -1,7 +1,7 @@ output "branch_href" { description = "Link to the newly-created branch" value = join("/", [ - "https://github.com/", + "https://github.com", var.organization, var.repository, "tree",