From 9fc1150b4a634012452050dd59ab9471541f096e Mon Sep 17 00:00:00 2001
From: Matt Sheets <masheets@linux.microsoft.com>
Date: Sat, 11 Feb 2023 13:35:44 -0700
Subject: [PATCH 1/3] Fix issue with github script version update

github-script version 5 introduced a breaking update
that moved where listWorkflowRunArtifacts lives
---
 .github/workflows/comment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
index 42730936..0c73b94a 100644
--- a/.github/workflows/comment.yml
+++ b/.github/workflows/comment.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/github-script@v6
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
                run_id: ${{github.event.workflow_run.id }},
@@ -47,7 +47,7 @@ jobs:
         if: (matrix.rust-toolchain == 'nightly')
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
                run_id: ${{github.event.workflow_run.id }},

From a17b6089f69d0341f7d77678f612fdee93be2007 Mon Sep 17 00:00:00 2001
From: Matt Sheets <masheets@linux.microsoft.com>
Date: Sat, 11 Feb 2023 13:46:42 -0700
Subject: [PATCH 2/3] do not merge

---
 src/compile.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compile.rs b/src/compile.rs
index 582bb169..fc070f1d 100644
--- a/src/compile.rs
+++ b/src/compile.rs
@@ -47,11 +47,11 @@ pub fn compile_rules_one_file<'a>(
     )
 }
 
-pub fn generate_sexp(
+pub fn generate_sexp<'a>(
     type_map: &TypeMap,
     classlist: &ClassList,
     policy_rules: BTreeSet<ValidatedStatement>,
-    func_map: &FunctionMap<'_>,
+    func_map: &FunctionMap<'a>,
     machine_configurations: &Option<&BTreeMap<String, &Argument>>,
 ) -> Result<Vec<sexp::Sexp>, CascadeErrors> {
     let type_decl_list = organize_type_map(type_map)?;

From ca024b1a7fcc14e6dba5ab334882fa5b5722bbb9 Mon Sep 17 00:00:00 2001
From: Matt Sheets <masheets@linux.microsoft.com>
Date: Sat, 11 Feb 2023 14:00:32 -0700
Subject: [PATCH 3/3] Revert "do not merge"

This reverts commit a17b6089f69d0341f7d77678f612fdee93be2007.
---
 src/compile.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compile.rs b/src/compile.rs
index fc070f1d..582bb169 100644
--- a/src/compile.rs
+++ b/src/compile.rs
@@ -47,11 +47,11 @@ pub fn compile_rules_one_file<'a>(
     )
 }
 
-pub fn generate_sexp<'a>(
+pub fn generate_sexp(
     type_map: &TypeMap,
     classlist: &ClassList,
     policy_rules: BTreeSet<ValidatedStatement>,
-    func_map: &FunctionMap<'a>,
+    func_map: &FunctionMap<'_>,
     machine_configurations: &Option<&BTreeMap<String, &Argument>>,
 ) -> Result<Vec<sexp::Sexp>, CascadeErrors> {
     let type_decl_list = organize_type_map(type_map)?;