Skip to content

Commit e351cda

Browse files
authored
Merge pull request #221 from secure-software-engineering/ci/snapshotrelease
ci/snapshotrelease
2 parents f116186 + 79e92e7 commit e351cda

File tree

8 files changed

+48
-82
lines changed

8 files changed

+48
-82
lines changed

.github/workflows/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ on:
44
pull_request:
55
types: [ opened, reopened, synchronize ]
66

7-
permissions:
8-
contents: write
9-
pull-requests: write
10-
117
jobs:
128
ApproveAndMerge:
139
name: Auto approve Dependabot PRs

.github/workflows/deploy-snapshots.yml renamed to .github/workflows/deploy-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
server-password: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
2525
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
2626
gpg-passphrase: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
27-
mvn-cli-args: '-DskipTests -Dmaven.javadoc.skip=true -Pdeployment'
27+
mvn-cli-args: '-DskipTests -Pdeployment'
2828
deploy-mode: snapshot

.github/workflows/doc_deployment.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Documentation Deployment
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
tags:
8+
- '*'
9+
10+
concurrency:
11+
group: gh-pages
12+
13+
jobs:
14+
deploy-doc:
15+
name: Deploy Stable Documentation
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: write
19+
steps:
20+
- name: Checkout Repository
21+
uses: actions/checkout@v4
22+
with:
23+
ref: ${{ github.ref }}
24+
25+
- name: Deploy Documentation
26+
uses: secure-software-engineering/actions/documentation/deployment@develop
27+
with:
28+
version: ${{ github.ref_name }}

.github/workflows/doc_preview.yml renamed to .github/workflows/documentation-pr-preview.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
paths:
1111
- mkdocs.yml
1212
- docs/**
13-
- .github/workflows/doc_preview.yml
13+
- .github/workflows/documentation-pr-preview.yml
1414

1515
concurrency:
1616
group: gh-pages
@@ -21,16 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
2222
permissions:
2323
contents: write
24-
pull-requests: write
24+
pull-requests: write # for posting a comment
2525

2626
steps:
2727
- name: Checkout Repository
2828
uses: actions/checkout@v4
2929
with:
30-
fetch-depth: 0
30+
fetch-depth: 0 # mike needs full history to push to gh-pages
3131

3232
- name: Create Documentation Preview
33-
uses: secure-software-engineering/actions/documentation/handle-pr-preview@develop
34-
with:
35-
preview-name: pr-${{ github.event.pull_request.number }}
36-
preview-title: Preview for PR-${{ github.event.pull_request.number }}
33+
uses: secure-software-engineering/actions/documentation/pr-preview@develop

.github/workflows/formalities.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Codestyle etc.
22

3-
on: [pull_request]
3+
on: [ pull_request ]
44

55
jobs:
66
check-formatting:

.github/workflows/maven.yml renamed to .github/workflows/tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
framework: [Soot, SootUp, Opal]
17+
framework: [ Soot, SootUp, Opal ]
1818
runs-on: ubuntu-latest
1919
steps:
20-
- name: Checkout source code
21-
uses: actions/checkout@v4
22-
- name: Set up JDK 11
23-
uses: actions/setup-java@v4
24-
with:
20+
- name: Checkout source code
21+
uses: actions/checkout@v4
22+
- name: Set up JDK 11
23+
uses: actions/setup-java@v4
24+
with:
2525
distribution: adopt
2626
java-package: jdk
2727
java-version: 11
28-
- name: Build with Maven
29-
run: mvn -B clean verify -DtestSetup=${{ matrix.framework }}
28+
- name: Build with Maven
29+
run: mvn -B clean verify -DtestSetup=${{ matrix.framework }}

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,16 @@
363363
<version>0.9.0</version>
364364
<extensions>true</extensions>
365365
<configuration>
366+
<deploymentName>${project.artifactId} ${project.version}</deploymentName>
366367
<!-- Same id as in the deployment workflow -->
367368
<publishingServerId>central</publishingServerId>
369+
<waitUntil>validated</waitUntil>
368370
<autoPublish>true</autoPublish>
369371
<waitUntil>validated</waitUntil>
370-
<deploymentName>${project.name} ${project.version}</deploymentName>
372+
<excludeArtifacts>
373+
<exclude>testCore</exclude>
374+
<exclude>SparseBoomerangCorrectness</exclude>
375+
</excludeArtifacts>
371376
</configuration>
372377
</plugin>
373378
</plugins>

0 commit comments

Comments
 (0)