Browse Source

Merge branch '6.3.x' into 6.4.x

pull/16523/head
Josh Cummings 11 months ago
parent
commit
f4d2b61405
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
  1. 2
      .github/workflows/continuous-integration-workflow.yml
  2. 2
      buildSrc/src/main/java/s101/S101Plugin.java

2
.github/workflows/continuous-integration-workflow.yml

@ -79,7 +79,7 @@ jobs:
env: env:
STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }} STRUCTURE101_LICENSEID: ${{ secrets.STRUCTURE101_LICENSEID }}
run: | run: |
./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace ./gradlew assemble s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
deploy-artifacts: deploy-artifacts:
name: Deploy Artifacts name: Deploy Artifacts
needs: [ build, test, check-samples, check-tangles ] needs: [ build, test, check-samples, check-tangles ]

2
buildSrc/src/main/java/s101/S101Plugin.java

@ -50,7 +50,7 @@ public class S101Plugin implements Plugin<Project> {
private void configure(JavaExec exec) { private void configure(JavaExec exec) {
exec.setDescription("Runs Structure101 headless analysis, installing and configuring if necessary"); exec.setDescription("Runs Structure101 headless analysis, installing and configuring if necessary");
exec.dependsOn("check"); exec.dependsOn("assemble");
Project project = exec.getProject(); Project project = exec.getProject();
S101PluginExtension extension = project.getExtensions().getByType(S101PluginExtension.class); S101PluginExtension extension = project.getExtensions().getByType(S101PluginExtension.class);
exec exec

Loading…
Cancel
Save