Merge pull request #82 from privacysandbox/release-0.57.1

Release 0.57.1
privacysandbox · Mar 28, 2024 · 7bb8f72 · 7bb8f72
2 parents b69118a + 7c8e09a
commit 7bb8f72
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml
@@ -26,14 +26,14 @@ on:
     - cron: '35 10 * * 4'
   push:
     branches:
-    - main
+      - main
 
 # Declare default permissions as read only.
 permissions: read-all
 
 jobs:
   analysis:
-    name: Scorecard analysis
+    name: OpenSSF Scorecard analysis
     runs-on: ubuntu-latest
     permissions:
       # Needed to upload the results to code-scanning dashboard.
@@ -46,12 +46,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 
       - name: Run analysis
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -73,14 +73,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: Upload artifact
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## 0.57.1 (2024-03-28)
+
+
+### Bug Fixes
+
+* Upgrade OpenSSF scorecard GitHub Action
+
 ## 0.57.0 (2024-03-10)
 
 

diff --git a/images/build-debian/Dockerfile b/images/build-debian/Dockerfile
@@ -18,7 +18,7 @@ ARG BASE_IMAGE=ubuntu:20.04
 # hadolint ignore=DL3006
 FROM ${BASE_IMAGE} as libprofiler-builder
 ENV CC=clang \
-    CXX=clang
+    CXX=clang++
 ADD https://github.com/gperftools/gperftools/releases/download/gperftools-2.13/gperftools-2.13.tar.gz /build/gperftools.tar.gz
 ADD https://apt.llvm.org/llvm.sh /build/llvm.sh
 COPY compile_libprofiler /scripts/

diff --git a/images/build-debian/compile_libprofiler b/images/build-debian/compile_libprofiler
@@ -24,6 +24,7 @@ function install_clang() {
   /build/llvm.sh ${CLANG_VER}
   apt-get --quiet install -y --no-install-recommends libc++-${CLANG_VER}-dev
   update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VER} 100
+  update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VER} 100
   rm -f llvm.sh
 
   clang --version

diff --git a/tests/data/hashes/build-debian b/tests/data/hashes/build-debian
@@ -1 +1 @@
-38cc8a23a6a56eb6567bef3685100cd3be1c0491dcc8b953993c42182da3fa40
+35e001149b0e33cba53e9a393c157ef920b3ab2adabcebd07eee0e3d4d9fccf3
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.57.0
+0.57.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		38cc8a23a6a56eb6567bef3685100cd3be1c0491dcc8b953993c42182da3fa40
		35e001149b0e33cba53e9a393c157ef920b3ab2adabcebd07eee0e3d4d9fccf3