Skip to content

Commit

Permalink
fix(ci): OSSF Changes (#1769)
Browse files Browse the repository at this point in the history
* Change permissions to be more granular

* update to pinned deps

* remove gradle wrapper

* perms

* perms

* fix pinned deps

* add gradle download

* add hashes

* pin to hash

* update path for props file

* update build script

* fix path

* add setup setup

* build wrapper

* gradle ver inc
  • Loading branch information
sthulb authored Feb 17, 2025
1 parent bf91b40 commit ed89b3c
Show file tree
Hide file tree
Showing 8 changed files with 280 additions and 10 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/osv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ on:
branches: [main]

permissions:
# Required to upload SARIF file to CodeQL. See: https://github.com/github/codeql-action/issues/2117
actions: read
# Require writing security events to upload SARIF file to security tab
security-events: write
# Only need to read contents
contents: read

jobs:
scan-pr:
uses: "google/osv-scanner-action/.github/workflows/[email protected]"
permissions:
actions: read
contents: read
security-events: write
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@764c91816374ff2d8fc2095dab36eecd42d61638"
7 changes: 7 additions & 0 deletions .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ jobs:
cache: 'maven'
- name: Build with Maven
run: mvn -B install --file pom.xml
- name: Build Gradle Setup
if: ${{ matrix.java == '8' }} # Gradle example can only be built on Java 8
working-directory: examples/powertools-examples-core/gradle
run: |
curl -L -o gradle/wrapper/gradle.zip https:$(cat gradle/wrapper/gradle-wrapper.properties | grep distributionUrl | cut -d ':' -f 2)
unzip gradle/wrapper/gradle.zip -d gradle/wrapper/gradle
./gradle/wrapper/gradle/gradle-8.2.1/bin/gradle wrapper
- name: Build Gradle Example - Java
if: ${{ matrix.java == '8' }} # Gradle example can only be built on Java 8
working-directory: examples/powertools-examples-core/gradle
Expand Down
6 changes: 4 additions & 2 deletions docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
FROM squidfunk/mkdocs-material
RUN pip install mkdocs-git-revision-date-plugin mkdocs-macros-plugin
FROM squidfunk/mkdocs-material@sha256:6ffbcd0e1438f3278341e437048ba4507e7e0af70efe700dd6d8a1d76fc071dd

COPY requirements.txt /tmp/
RUN pip install --require-hashes -r /tmp/requirements.txt
2 changes: 2 additions & 0 deletions docs/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mkdocs-git-revision-date-plugin==0.3.2
mkdocs-macros-plugin==1.3.7
260 changes: 260 additions & 0 deletions docs/requirements.txt

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit ed89b3c

Please sign in to comment.