From bbee9eb0503cfc9808120c59675698049fa36175 Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Wed, 21 Dec 2022 23:42:29 +0900
Subject: [PATCH 1/5] test the reports workflow on Pull Requests

---
 .github/workflows/reports.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml
index 5a5d33af..184e52c2 100644
--- a/.github/workflows/reports.yml
+++ b/.github/workflows/reports.yml
@@ -6,6 +6,11 @@ on:
       - "master"
     paths:
       - "build/reports/*.Rmd"
+  pull_request:
+    branches:
+      - "master"
+    paths:
+      - "build/reports/*.Rmd"
   workflow_run:
     workflows:
       - "Build & Push Core images"
@@ -71,6 +76,7 @@ jobs:
       - name: Set as safe for following git commands
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout wiki
+        if: github.event_name != 'pull_request'
         uses: actions/checkout@v3
         with:
           repository: "${{ github.repository }}.wiki"
@@ -87,7 +93,14 @@ jobs:
         run: |
           make --jobs=2 report-all
           make --always-make wiki-home
+      - name: Upload artifacts
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v3
+        with:
+          name: reports
+          path: reports
       - name: Update wiki
+        if: github.event_name != 'pull_request'
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Automated update

From eaffdd998a9bfca58c28e53d21e89318cc70f7cd Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Wed, 21 Dec 2022 23:46:10 +0900
Subject: [PATCH 2/5] remove the deprecated `set-output` workflow command

---
 .github/workflows/reports.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml
index 184e52c2..02052748 100644
--- a/.github/workflows/reports.yml
+++ b/.github/workflows/reports.yml
@@ -35,7 +35,7 @@ jobs:
       - id: set-matrix
         run: |
           CONTENT=$(jq -r '.r_version += ["extra"] | tostring' build/matrix/all.json)
-          echo ::set-output name=matrix::"${CONTENT}"
+          echo "matrix=CONTENT" >> $GITHUB_ENV
           echo "${CONTENT}"
 
   inspect:

From 68daf6323ce7f2244dedf0147cad9a584dff724f Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Wed, 21 Dec 2022 23:54:59 +0900
Subject: [PATCH 3/5] deinstalled packages should not be listed in reports

---
 Makefile                   | 2 +-
 build/reports/template.Rmd | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7daadc10..6a5a6787 100755
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ IMAGE_FILTER ?= label=org.opencontainers.image.source=$(IMAGE_SOURCE)
 inspect-image/%:
 	mkdir -p $(REPORT_SOURCE_ROOT)/$*
 	-docker image inspect $* > $(REPORT_SOURCE_ROOT)/$*/docker_inspect.json
-	-docker run --rm $* dpkg-query --show --showformat='$${Package}\t$${Version}\n' > $(REPORT_SOURCE_ROOT)/$*/apt_packages.tsv
+	-docker run --rm $* dpkg-query --show --showformat='$${Package}\t$${Version}\t$${Status}\n' > $(REPORT_SOURCE_ROOT)/$*/apt_packages.tsv
 	-docker run --rm $* Rscript -e 'as.data.frame(installed.packages()[, 3])' > $(REPORT_SOURCE_ROOT)/$*/r_packages.ssv
 	-docker run --rm $* python3 -m pip list --disable-pip-version-check > $(REPORT_SOURCE_ROOT)/$*/pip_packages.ssv
 inspect-manifest/%: inspect-image/%
diff --git a/build/reports/template.Rmd b/build/reports/template.Rmd
index 4f4896f3..a5847fae 100644
--- a/build/reports/template.Rmd
+++ b/build/reports/template.Rmd
@@ -144,6 +144,7 @@ df_apt <- params$apt_file |>
   stringr::str_subset(r"(\t)") |>
   I() |>
   read_tsv(col_names = FALSE) |>
+  dplyr::filter(X3 == "install ok installed") |>
   dplyr::select(
     package = X1,
     version = X2

From fec74f99acb835930a6afe58bcaba4598ecfc893 Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Thu, 22 Dec 2022 00:07:08 +0900
Subject: [PATCH 4/5] fix typo

---
 .github/workflows/reports.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml
index 02052748..87351ab2 100644
--- a/.github/workflows/reports.yml
+++ b/.github/workflows/reports.yml
@@ -35,7 +35,7 @@ jobs:
       - id: set-matrix
         run: |
           CONTENT=$(jq -r '.r_version += ["extra"] | tostring' build/matrix/all.json)
-          echo "matrix=CONTENT" >> $GITHUB_ENV
+          echo "matrix=CONTENT" >> $GITHUB_OUTPUT
           echo "${CONTENT}"
 
   inspect:

From dba717c98703ae9d4dfa019cc3c2e0915b88cc0f Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Thu, 22 Dec 2022 00:13:29 +0900
Subject: [PATCH 5/5] fix syntax

---
 .github/workflows/reports.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml
index 87351ab2..6ee8226f 100644
--- a/.github/workflows/reports.yml
+++ b/.github/workflows/reports.yml
@@ -35,7 +35,7 @@ jobs:
       - id: set-matrix
         run: |
           CONTENT=$(jq -r '.r_version += ["extra"] | tostring' build/matrix/all.json)
-          echo "matrix=CONTENT" >> $GITHUB_OUTPUT
+          echo "matrix=${CONTENT}" >> "$GITHUB_OUTPUT"
           echo "${CONTENT}"
 
   inspect: