Skip to content

Commit

Permalink
Merge pull request #1540 from rjhancock/fix-actions
Browse files Browse the repository at this point in the history
Clean up of Actions and normalization of them.
  • Loading branch information
HammerGS authored Jun 30, 2024
2 parents 4794974 + d652553 commit cd1e5ba
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 226 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,6 @@ jobs:
fail_ci_if_error: false
verbose: true

# If we have a buildScanUri comment on the PR
#
# NB: This only works if you're on the main MegaMek\megameklab repo
# for now due to a GitHub Actions limitation.
# CAW: temporarily halted https://github.com/thollander/actions-comment-pull-request/issues/17
# - name: Comment on PR with Build Scan URI
# uses: thollander/actions-comment-pull-request@master
# if: always() && steps.gradle_build.outputs.buildScanUri != ''
# with:
# message: Build scan available at ${{ steps.gradle_build.outputs.buildScanUri }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Put the Windows Release in an artifact
# NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
- name: Upload Windows Release
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# See: https://github.com/MegaMek/megamek/wiki/Working-With-Gradle
- name: Setup Composite Build for MegaMekLab
run: |
echo "includeBuild '../megamek'" >./megameklab/settings_local.gradle
echo "includeBuild '../megamek'" >> ./megameklab/settings_local.gradle
# Checkout the latest MegaMek source and put it in: ./megamek
- name: Checkout MegaMek
Expand All @@ -53,18 +53,12 @@ jobs:
distribution: ${{ matrix.java-distribution }}
java-version: ${{ matrix.java-version }}

# Make sure we can execute the Gradle wrapper
- name: Grant execute permission for gradlew (*nix or MacOS)
working-directory: megameklab
run: chmod +x gradlew
if: runner.os != 'Windows'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Build with Gradle
working-directory: megameklab
run: ./gradlew build --stacktrace --scan
run: ./gradlew test

# If the build step fails, try to upload any test logs in case it was a unit test failure.
#
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
push:
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
schedule:
- cron: "24 16 * * 4"
Expand Down Expand Up @@ -106,7 +105,7 @@ jobs:

- name: Build with Gradle
working-directory: megameklab
run: ./gradlew build --stacktrace --scan
run: ./gradlew jar

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
8 changes: 1 addition & 7 deletions .github/workflows/nightly-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# See: https://github.com/MegaMek/megamek/wiki/Working-With-Gradle
- name: Setup Composite Build for MegaMekLab
run: |
echo "includeBuild '../megamek'" >./megameklab/settings_local.gradle
echo "includeBuild '../megamek'" >> ./megameklab/settings_local.gradle
# Checkout the latest MegaMek source and put it in: ./megamek
- name: Checkout MegaMek
Expand All @@ -54,12 +54,6 @@ jobs:
distribution: ${{ matrix.java-distribution }}
java-version: ${{ matrix.java-version }}

# Don't run this for Windows.
- name: Grant execute permission for gradlew (*nix or MacOS)
working-directory: megameklab
run: chmod +x gradlew
if: runner.os != 'Windows'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

Expand Down
75 changes: 0 additions & 75 deletions .github/workflows/nightly-maven-ci.yml

This file was deleted.

98 changes: 0 additions & 98 deletions .github/workflows/update-maven-repo.yml.disabled

This file was deleted.

Loading

0 comments on commit cd1e5ba

Please sign in to comment.