Skip to content

Commit

Permalink
Move caching into setup-java, correct READMEs
Browse files Browse the repository at this point in the history
New setup-java version can cache local Maven repository for us, so
make it so.

Make READMEs go back to saying "mvn install" instead of "mvn package"
because I forgot a single pom file needs to be installed into the
local Maven repository for the build to work (then you can say "mvn
package" for everything else).
  • Loading branch information
tuxji committed Aug 27, 2021
1 parent e5e4bfe commit bd1b760
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 29 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
types: [opened, synchronize, reopened]
workflow_dispatch:

# Runs a build job as a check:
# Runs a build job as a CI check:
# - Builds VERDICT source & runs unit tests

jobs:
Expand All @@ -33,13 +33,7 @@ jobs:
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java-version }}

- name: Set up Maven cache
uses: actions/[email protected]
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
cache: maven

- name: Build VERDICT source
run: |
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,7 @@ jobs:
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java-version }}

- name: Set up Maven cache
if: runner.os == 'Linux'
uses: actions/[email protected]
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
cache: maven

- name: Build VERDICT source
if: runner.os == 'Linux'
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,7 @@ jobs:
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java-version }}

- name: Set up Maven cache
uses: actions/[email protected]
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
cache: maven

- name: Build VERDICT source
run: |
Expand Down
6 changes: 4 additions & 2 deletions tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ subdirectories:
Please read the development instructions in these subdirectories'
README.md files for further details. Note that you can descend into
each subdirectory and build it with Maven separately or you can build
all three subdirectories from this location with these Maven commands:
all three subdirectories from this location with these two commands,
making sure to call the clean and install goals separately (not in the
same Maven command line):

```shell
mvn clean
mvn package -Dtycho.localArtifacts=ignore
mvn install -Dtycho.localArtifacts=ignore
```

## Install our VERDICT plugin
Expand Down
4 changes: 2 additions & 2 deletions tools/verdict-back-ends/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ in that mirrorOf section before your build will finish successfully.

## Build the Java back-end programs

To build the Java program sources on your system, simply run the
following Maven command:
To build the Java program sources on your system, run the following
command in this directory:

`mvn clean install`

Expand Down
4 changes: 2 additions & 2 deletions tools/verdict/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ This directory and its subdirectories have pom.xml files which will
allow you to build our VERDICT plugin sources with Maven and Eclipse
Tycho. We recommend that you build our VERDICT plugin sources with
Maven from the command line in this directory or the directory above,
making sure to call the clean and package goals separately (not in the
making sure to call the clean and install goals separately (not in the
same Maven command line):

```shell
mvn clean
mvn package -Dtycho.localArtifacts=ignore
mvn install -Dtycho.localArtifacts=ignore
```

Using the `-Dtycho.localArtifacts=ignore` argument may prevent some
Expand Down

0 comments on commit bd1b760

Please sign in to comment.