Merge branch 'main' of github.com:slsa-framework/example-package

Author: kpk47

.github/workflows/scripts/e2e-report-failure.sh

@@ -7,7 +7,17 @@ THIS_FILE=$(e2e_this_file)
 
 e2e_create_issue_failure_body
 
-ISSUE_ID=$(gh -R "$ISSUE_REPOSITORY" issue list --label "e2e" --label "type:bug" --state open -S "$THIS_FILE" --json number | jq '.[0]' | jq -r '.number' | jq 'select (.!=null)')
+if [[ -z "$TITLE" ]]; then
+    # Replace `.`` by ` `, remove the last 3 characters `yml` and remove the e2e prefix
+    TITLE=$(echo "$THIS_FILE" | sed -e 's/\./ /g' | rev | cut -c4- | rev | cut -c5-)
+fi
+if [[ -z "$WORKFLOW" ]]; then
+    WORKFLOW=$(echo "$THIS_FILE" | cut -d '.' -f2)
+fi
+if [[ -z "$HEADER" ]]; then
+    HEADER="e2e"
+fi
+ISSUE_ID=$(gh -R "$ISSUE_REPOSITORY" issue list --label "$HEADER" --label "type:bug" --state open -S "$THIS_FILE" --json number | jq '.[0]' | jq -r '.number' | jq 'select (.!=null)')
 
 # Use the PAT_TOKEN if one is specified.
 # TODO(github.com/slsa-framework/example-package/issues/52): Always use PAT_TOKEN
@@ -17,10 +27,7 @@ if [[ -z "$TOKEN" ]]; then
 fi
 
 if [[ -z "$ISSUE_ID" ]]; then
-    # Replace `.`` by ` `, remove the last 3 characters `yml` and remove the e2e prefix
-    TITLE=$(echo "$THIS_FILE" | sed -e 's/\./ /g' | rev | cut -c4- | rev | cut -c5-)
-    WORKFLOW=$(echo "$THIS_FILE" | cut -d '.' -f2)
-    GH_TOKEN=$TOKEN gh -R "$ISSUE_REPOSITORY" issue create -t "[e2e]: $TITLE" -F ./BODY --label "e2e" --label "type:bug" --label "workflow:$WORKFLOW"
+    GH_TOKEN=$TOKEN gh -R "$ISSUE_REPOSITORY" issue create -t "[$HEADER]: $TITLE" -F ./BODY --label "$HEADER" --label "type:bug" --label "workflow:$WORKFLOW"
 else
     GH_TOKEN=$TOKEN gh -R "$ISSUE_REPOSITORY" issue comment "$ISSUE_ID" -F ./BODY
 fi

.github/workflows/scripts/e2e-report-success.sh

@@ -7,7 +7,11 @@ THIS_FILE=$(e2e_this_file)
 
 e2e_create_issue_success_body
 
-ISSUE_ID=$(gh -R "$ISSUE_REPOSITORY" issue list --label "e2e" --label "type:bug" --state open -S "$THIS_FILE" --json number | jq '.[0]' | jq -r '.number' | jq 'select (.!=null)')
+if [[ -z "$HEADER" ]]; then
+    HEADER="e2e"
+fi
+    
+ISSUE_ID=$(gh -R "$ISSUE_REPOSITORY" issue list --label "$HEADER" --label "type:bug" --state open -S "$THIS_FILE" --json number | jq '.[0]' | jq -r '.number' | jq 'select (.!=null)')
 
 # Use the PAT_TOKEN if one is specified.
 # TODO(github.com/slsa-framework/example-package/issues/52): Always use PAT_TOKEN

.github/workflows/scripts/e2e.go.default.verify.sh

@@ -30,7 +30,7 @@ verify_provenance_content() {
     has_assets=$(echo "$THIS_FILE" | cut -d '.' -f5 | grep -v noassets)
     TAG=$(echo "$THIS_FILE" | cut -d '.' -f5 | grep tag)
     # Note GO_MAIN and GO_DIR are set in the workflows as env variables.
-    DIR="$PWD"
+    DIR="$PWD/__PROJECT_CHECKOUT_DIR__"
     if [[ -n "$GO_DIR" ]]; then
         DIR="$DIR/$GO_DIR"
     fi
@@ -50,11 +50,11 @@ verify_provenance_content() {
     # First step is vendoring
     e2e_verify_predicate_buildConfig_step_command "0" "$ATTESTATION" "[\"mod\",\"vendor\"]"
     e2e_verify_predicate_buildConfig_step_env "0" "$ATTESTATION" "[]"
-    e2e_verify_predicate_buildConfig_step_workingDir "0" "$ATTESTATION" "$DIR/__PROJECT_CHECKOUT_DIR__"
+    e2e_verify_predicate_buildConfig_step_workingDir "0" "$ATTESTATION" "$DIR"
 
     # Second step is the actual compilation.
     e2e_verify_predicate_buildConfig_step_env "1" "$ATTESTATION" "[\"GOOS=linux\",\"GOARCH=amd64\",\"GO111MODULE=on\",\"CGO_ENABLED=0\"]"
-    e2e_verify_predicate_buildConfig_step_workingDir "1" "$ATTESTATION" "$DIR/__PROJECT_CHECKOUT_DIR__"
+    e2e_verify_predicate_buildConfig_step_workingDir "1" "$ATTESTATION" "$DIR"
 
     if [[ -z "$LDFLAGS" ]]; then
         e2e_verify_predicate_buildConfig_step_command "1" "$ATTESTATION" "[\"build\",\"-mod=vendor\",\"-trimpath\",\"-tags=netgo\",\"-o\",\"$BINARY\"]"

e2e/dummy

@@ -1 +1 @@
-Fri Oct 21 04:26:48 PM UTC 2022
+Mon Oct 24 08:20:47 AM UTC 2022

e2e/e2e.container.push.main.default.slsa3.yml.txt

@@ -1 +1 @@
-Thu Oct 27 04:00:43 UTC 2022
+Thu Oct 27 04:04:36 UTC 2022

e2e/e2e.generic.push.main.default.slsa3.yml.txt

@@ -1 +1 @@
-Thu Oct 27 04:06:55 UTC 2022
+Thu Oct 27 04:06:55 UTC 2022

e2e/e2e.go.push.main.config-ldflags.slsa3.yml.txt

@@ -1 +1 @@
-Fri Oct 21 06:46:29 UTC 2022
+Thu Oct 27 06:33:18 UTC 2022

e2e/e2e.go.push.main.config-noldflags.slsa3.yml.txt

@@ -1 +1 @@
-Fri Oct 21 20:00:54 UTC 2022
+Thu Oct 27 04:09:19 UTC 2022