Skip to content

Commit 890d8a1

Browse files
author
Martin Traverse
authoredJul 6, 2024
CI Updates (#432)
* Fix zip type for binaries * Fix zip type for compliance reports * Do not publish SQL drivers to Sonatype * Do not release JARs, this is just a test * Stop forcing dep check version for web API compliance (new JS wrapper works with later versions) * Add missing fields in SQL drivers build.gradle file * Work around issues in JS OWASP tool * Turn release step back on in Sonatype publishing * Work around issues in JS OWASP tool
1 parent ac2a352 commit 890d8a1

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed
 

‎.github/workflows/compliance.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -196,17 +196,16 @@ jobs:
196196
# ODC version must be forced because the NodeJS wrapper breaks for versions >= 10.0.0
197197
- name: OWASP dependency check
198198
env:
199-
ODC_VERSION_TAG: "v9.2.0"
200199
NVD_DATAFEED: "https://dependency-check.github.io/DependencyCheck_Builder/nvd_cache/"
201200
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
202201
run: |
203202
mkdir -p build/compliance
204203
cd tracdap-api/packages/web
205-
mkdir ./odc_bin
204+
mkdir -p ./dependency-check-bin/latest
206205
if [ -n "${NVD_API_KEY}" ]; then
207-
npm run compliance-owasp -- --odc-version "${ODC_VERSION_TAG}" --bin ./odc_bin --nvdDatafeed "${NVD_DATAFEED}" --nvdApiKey "${NVD_API_KEY}"
206+
npm run compliance-owasp -- --nvdDatafeed "${NVD_DATAFEED}" --nvdApiKey "${NVD_API_KEY}"
208207
else
209-
npm run compliance-owasp -- --odc-version "${ODC_VERSION_TAG}" --bin ./odc_bin --nvdDatafeed "${NVD_DATAFEED}"
208+
npm run compliance-owasp -- --nvdDatafeed "${NVD_DATAFEED}"
210209
fi
211210
212211
- name: NVD save cache (Web API)
@@ -257,14 +256,14 @@ jobs:
257256
path: tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}
258257

259258
- name: Build compliance reports tarball
260-
run: tar -cvzf tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}/
259+
run: zip -r tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}.zip tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}/
261260

262261
- name: Publish compliance reports
263262
uses: actions/upload-release-asset@v1
264263
env:
265264
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
266265
with:
267266
upload_url: ${{ github.event.release.upload_url }}
268-
asset_path: tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
269-
asset_name: tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
270-
asset_content_type: application/gzip
267+
asset_path: tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
268+
asset_name: tracdap-compliance-reports-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
269+
asset_content_type: application/zip

‎.github/workflows/packaging.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,17 @@ jobs:
296296
path: tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}/web_api_package
297297

298298
- name: Build API packages tarball
299-
run: tar -cvzf tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}/
299+
run: zip -r tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}.zip tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}/
300300

301301
- name: Publish platform package
302302
uses: actions/upload-release-asset@v1
303303
env:
304304
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
305305
with:
306306
upload_url: ${{ github.event.release.upload_url }}
307-
asset_path: tracdap-platform-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
308-
asset_name: tracdap-platform-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
309-
asset_content_type: application/gzip
307+
asset_path: tracdap-platform-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
308+
asset_name: tracdap-platform-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
309+
asset_content_type: application/zip
310310

311311
- name: Publish sandbox package
312312
uses: actions/upload-release-asset@v1
@@ -324,19 +324,19 @@ jobs:
324324
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
325325
with:
326326
upload_url: ${{ github.event.release.upload_url }}
327-
asset_path: tracdap-plugins-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
328-
asset_name: tracdap-plugins-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
329-
asset_content_type: application/gzip
327+
asset_path: tracdap-plugins-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
328+
asset_name: tracdap-plugins-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
329+
asset_content_type: application/zip
330330

331331
- name: Publish API packages
332332
uses: actions/upload-release-asset@v1
333333
env:
334334
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
335335
with:
336336
upload_url: ${{ github.event.release.upload_url }}
337-
asset_path: tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
338-
asset_name: tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}.tgz
339-
asset_content_type: application/gzip
337+
asset_path: tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
338+
asset_name: tracdap-api-packages-${{ steps.tracdap-version.outputs.tracdap_version }}.zip
339+
asset_content_type: application/zip
340340

341341
publish_to_pypi:
342342

‎tracdap-plugins/sql-drivers/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ plugins {
1919
id "distribution"
2020
}
2121

22-
// SQL Drivers is not a project itself, there is no sql-drivers JAR file
23-
// Instead it is a way to pull in and package dependencies for the supported SQL dialects
22+
description = "SQL drivers plugin (placeholder, not required for production builds)"
23+
24+
// Put plugins into a separate package group
25+
group = "org.finos.tracdap.plugins"
2426

2527
// Use a different build dir (don't include plugins in the main release package)
2628
project.buildDir = rootProject.buildDir.path + '/plugins/' + project.name

0 commit comments

Comments
 (0)