Trying to get CI working as expected

This commit is contained in:
Joel Rudsberg 2024-11-29 17:03:25 +01:00
parent 1a3dab34e4
commit a772bb7df1
2 changed files with 16 additions and 16 deletions

View File

@ -12,16 +12,14 @@ permissions:
contents: read contents: read
jobs: jobs:
build: # make sure build/ci work properly # build: # make sure build/ci work properly
runs-on: ubuntu-latest # runs-on: ubuntu-latest
steps: # steps:
- uses: actions/checkout@v4 # - uses: actions/checkout@v4
- run: |
npm install
- run: |
npm run build && npm run package && npm test
# - run: | # - run: |
# npm run all # npm install
# - run: |
# npm run build && npm run package && npm run test
# test: # test:
# name: GraalVM # name: GraalVM
# runs-on: ${{ matrix.os }} # runs-on: ${{ matrix.os }}
@ -419,12 +417,19 @@ jobs:
# - name: Remove components # - name: Remove components
# run: gu remove espresso llvm-toolchain nodejs python ruby wasm # run: gu remove espresso llvm-toolchain nodejs python ruby wasm
test-sbom: test-sbom:
needs: build
name: test 'native-image-enable-sbom' option name: test 'native-image-enable-sbom' option
runs-on: macos-latest # TODO: use matrix vlaue runs-on: macos-latest # TODO: use matrix vlaue
permissions:
contents: read
pull-requests: write
# TODO: use appropriate matrix # TODO: use appropriate matrix
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Build action
run: |
npm install
npm run build
npm run package
- uses: ./ - uses: ./
with: with:
java-version: '23' java-version: '23'

View File

@ -18,11 +18,6 @@ import {setUpSBOMSupport} from './features/sbom'
async function run(): Promise<void> { async function run(): Promise<void> {
try { try {
core.info('')
core.info('Starting setup...')
const isSbomEnabled = core.getInput('native-image-enable-sbom') === 'true'
core.info(`SBOM generation is ${isSbomEnabled ? 'enabled' : 'disabled'}`)
core.info('')
const javaVersion = core.getInput(c.INPUT_JAVA_VERSION, {required: true}) const javaVersion = core.getInput(c.INPUT_JAVA_VERSION, {required: true})
const javaPackage = core.getInput(c.INPUT_JAVA_PACKAGE) const javaPackage = core.getInput(c.INPUT_JAVA_PACKAGE)
const distribution = core.getInput(c.INPUT_DISTRIBUTION) const distribution = core.getInput(c.INPUT_DISTRIBUTION)