Skip to content

Commit

Permalink
Package updates (#1458)
Browse files Browse the repository at this point in the history
* Update packages

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>

---------

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
  • Loading branch information
prabhu authored Nov 16, 2024
1 parent d5b8bd0 commit eb12026
Show file tree
Hide file tree
Showing 50 changed files with 357 additions and 191 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '22.x'
node-version: '23.x'
- name: Install dependencies
run: |
sudo apt-get install -y python3.8 python3.8-dev python3-pip python3-testresources python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev
Expand Down
49 changes: 47 additions & 2 deletions .github/workflows/binary-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,52 @@ jobs:
if: github.repository == 'CycloneDX/cdxgen'
strategy:
matrix:
os: [windows-latest]
os: ['ubuntu-latest', 'windows-latest', 'arm64']
include:
- os: ubuntu-latest
build: |
rm -rf ci contrib tools_config
npx --yes @appthreat/caxa --input . --output "cdxgen" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/bin/cdxgen.js"
chmod +x cdxgen
./cdxgen --version
sha256sum cdxgen > cdxgen.sha256
rm -rf node_modules
npm install --omit=optional --omit=dev --no-package-lock --no-audit --no-fund --no-progress
npx --yes @appthreat/caxa --input . --output "cdxgen-slim" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/bin/cdxgen.js"
chmod +x cdxgen-slim
./cdxgen-slim --version
sha256sum cdxgen-slim > cdxgen-slim.sha256
npx --yes @appthreat/caxa --input . --output "cdx-verify" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/bin/verify.js"
chmod +x cdx-verify
./cdx-verify --version
sha256sum cdx-verify > cdx-verify.sha256
./cdxgen --help
./cdxgen-slim --help
artifact: cdxgen
sartifact: cdxgen-slim
vartifact: cdx-verify
- os: arm64
build: |
rm -rf ci contrib tools_config
npx --no-progress --yes @appthreat/caxa --input . --output "cdxgen-arm64" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/bin/cdxgen.js"
chmod +x cdxgen-arm64
./cdxgen-arm64 --version
sha256sum cdxgen-arm64 > cdxgen-arm64.sha256
rm -rf node_modules
npm install --omit=optional --omit=dev --no-package-lock --no-audit --no-fund --no-progress
npx --no-progress --yes @appthreat/caxa --input . --output "cdxgen-arm64-slim" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/bin/cdxgen.js"
chmod +x cdxgen-arm64-slim
./cdxgen-arm64-slim --version
sha256sum cdxgen-arm64-slim > cdxgen-arm64-slim.sha256
npx --no-progress --yes @appthreat/caxa --input . --output "cdx-arm64-verify" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/bin/verify.js"
chmod +x cdx-arm64-verify
./cdx-arm64-verify --version
sha256sum cdx-arm64-verify > cdx-arm64-verify.sha256
./cdxgen-arm64 --help
./cdxgen-arm64-slim --help
artifact: cdxgen-arm64
sartifact: cdxgen-arm64-slim
vartifact: cdx-arm64-verify
- os: windows-latest
build: |
Remove-Item ci -Recurse -Force
Expand Down Expand Up @@ -53,7 +97,8 @@ jobs:
node-version: '22.x'
- name: Produce sae
run: |
npm install --omit=dev --no-package-lock --no-audit --no-fund
npm install -g npm@10.3.0
npm install --omit=dev --no-package-lock --no-audit --no-fund --no-progress
${{ matrix.build }}
- uses: actions/upload-artifact@v4
with:
Expand Down
116 changes: 102 additions & 14 deletions .github/workflows/build-base-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.dotnet6
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-dotnet:v10,ghcr.io/cyclonedx/cdxgen-dotnet6:v10
tags: ghcr.io/cyclonedx/cdxgen-dotnet:v11,ghcr.io/cyclonedx/cdxgen-dotnet6:v11
labels: ${{ steps.meta-cdxgen-dotnet.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.dotnet7
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-dotnet7:v10
tags: ghcr.io/cyclonedx/cdxgen-dotnet7:v11
labels: ${{ steps.meta-cdxgen-dotnet7.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -307,7 +307,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.dotnet8
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-dotnet8:v10
tags: ghcr.io/cyclonedx/cdxgen-dotnet8:v11
labels: ${{ steps.meta-cdxgen-dotnet8.outputs.labels }}

- name: Build and push Docker images
Expand All @@ -321,6 +321,94 @@ jobs:
tags: ${{ steps.meta-cdxgen-dotnet8.outputs.tags }}
labels: ${{ steps.meta-cdxgen-dotnet8.outputs.labels }}

sle-dotnet9-image:
if: github.repository == 'CycloneDX/cdxgen'
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta-bci-dotnet9
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/cyclonedx/bci-dotnet9
- name: Build and push Docker images
uses: docker/build-push-action@v5
with:
context: .
file: ci/base-images/sle/Dockerfile.dotnet9
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta-bci-dotnet9.outputs.tags }}
labels: ${{ steps.meta-bci-dotnet9.outputs.labels }}

cdxgen-dotnet9-image:
if: github.repository == 'CycloneDX/cdxgen'
runs-on: ubuntu-latest
needs: sle-dotnet9-image
permissions:
packages: write
steps:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta-cdxgen-dotnet9
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/cyclonedx/cdxgen-dotnet9
- name: Build and push Docker images
uses: docker/build-push-action@v5
if: github.ref == 'refs/heads/master'
with:
context: .
file: ci/base-images/cdxgen/Dockerfile.dotnet9
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-dotnet9:v11
labels: ${{ steps.meta-cdxgen-dotnet9.outputs.labels }}

- name: Build and push Docker images
uses: docker/build-push-action@v5
if: startsWith(github.ref, 'refs/tags/')
with:
context: .
file: ci/base-images/cdxgen/Dockerfile.dotnet9
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta-cdxgen-dotnet9.outputs.tags }}
labels: ${{ steps.meta-cdxgen-dotnet9.outputs.labels }}

sle-java-image:
if: github.repository == 'CycloneDX/cdxgen'
runs-on: ubuntu-latest
Expand Down Expand Up @@ -434,7 +522,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.java
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-java:v10,ghcr.io/cyclonedx/cdxgen-java11:v10
tags: ghcr.io/cyclonedx/cdxgen-java:v11,ghcr.io/cyclonedx/cdxgen-java11:v11
labels: ${{ steps.meta-cdxgen-java.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -485,7 +573,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.java-slim
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-java-slim:v10,ghcr.io/cyclonedx/cdxgen-java11-slim:v10
tags: ghcr.io/cyclonedx/cdxgen-java-slim:v11,ghcr.io/cyclonedx/cdxgen-java11-slim:v11
labels: ${{ steps.meta-cdxgen-java-slim.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -574,7 +662,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.node20
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-node:v10,ghcr.io/cyclonedx/cdxgen-node20:v10
tags: ghcr.io/cyclonedx/cdxgen-node:v11,ghcr.io/cyclonedx/cdxgen-node20:v11
labels: ${{ steps.meta-cdxgen-node20.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -700,7 +788,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.java17
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-java17:v10
tags: ghcr.io/cyclonedx/cdxgen-java17:v11
labels: ${{ steps.meta-cdxgen-java17.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -750,7 +838,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.java17-slim
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-java17-slim:v10
tags: ghcr.io/cyclonedx/cdxgen-java17-slim:v11
labels: ${{ steps.meta-cdxgen-java17-slim.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -801,7 +889,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.python
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-python:v10,ghcr.io/cyclonedx/cdxgen-python312:v10
tags: ghcr.io/cyclonedx/cdxgen-python:v11,ghcr.io/cyclonedx/cdxgen-python312:v11
labels: ${{ steps.meta-cdxgen-python.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -889,7 +977,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.python311
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-python311:v10
tags: ghcr.io/cyclonedx/cdxgen-python311:v11
labels: ${{ steps.meta-cdxgen-python311.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -977,7 +1065,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.python36
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-python36:v10
tags: ghcr.io/cyclonedx/cdxgen-python36:v11
labels: ${{ steps.meta-cdxgen-python36.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -1065,7 +1153,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.rolling
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-rolling:v10
tags: ghcr.io/cyclonedx/cdxgen-rolling:v11
labels: ${{ steps.meta-cdxgen-rolling.outputs.labels }}

opensuse-python310-image:
Expand Down Expand Up @@ -1142,7 +1230,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.python310
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-python310:v10
tags: ghcr.io/cyclonedx/cdxgen-python310:v11
labels: ${{ steps.meta-cdxgen-python310.outputs.labels }}

- name: Build and push Docker images
Expand Down Expand Up @@ -1230,7 +1318,7 @@ jobs:
file: ci/base-images/cdxgen/Dockerfile.python39
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/cyclonedx/cdxgen-python39:v10
tags: ghcr.io/cyclonedx/cdxgen-python39:v11
labels: ${{ steps.meta-cdxgen-python39.outputs.labels }}

- name: Build and push Docker images
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/dockertests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: ['22.x']
java-version: ['21']
node-version: ['23.x']
java-version: ['23']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -80,8 +80,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: ['22.x']
java-version: ['21']
node-version: ['23.x']
java-version: ['23']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -127,8 +127,8 @@ jobs:

strategy:
matrix:
node-version: ['22.x']
java-version: ['21']
node-version: ['23.x']
java-version: ['23']
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -170,8 +170,8 @@ jobs:

strategy:
matrix:
node-version: ['22.x']
java-version: ['21']
node-version: ['23.x']
java-version: ['23']
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java-reachables-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ['22.x']
node-version: ['23.x']
os: ['ubuntu-latest']
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
java-version: '23'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
Loading

0 comments on commit eb12026

Please sign in to comment.