Skip to content

Updates To Version Reading Methods. #1832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,24 @@ jobs:
ref: ${{ steps.find_mm.outputs.mmBranch }}
path: megamek

- name: Add MM Hash
run: |
cd megamek
calculatedSha=$(git rev-parse HEAD)
echo "$calculatedSha" >> ../megameklab/megameklab/docs/mm-revision.txt

- name: Set short git commit SHA
id: vars
run: |
cd megameklab
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV

- name: "Output branch information to Version file"
run: |
echo "branch=PR-${{ github.event.number }}" >> megamek/megamek/resources/extraVersion.properties
echo "gitHash=${{ env.COMMIT_SHORT_SHA }}" >> megamek/megamek/resources/extraVersion.properties

- name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
uses: actions/setup-java@v4
with:
Expand All @@ -65,7 +83,7 @@ jobs:

- name: Add MMLRevision file
run: |
echo ${{ github.sha }} >> megameklab/megameklab//mml-revision.txt
echo ${{ github.sha }} >> megameklab/megameklab/mml-revision.txt

- name: Test All
working-directory: megameklab
Expand All @@ -87,7 +105,7 @@ jobs:

- name: Build with Gradle
working-directory: megameklab
run: ./gradlew build -x test
run: ./gradlew build -x test -PextraVersion="PR-${{ github.event.number }}-${{ env.COMMIT_SHORT_SHA }}"

- name: Upload TarGZ Release
uses: actions/upload-artifact@v4
Expand Down
32 changes: 24 additions & 8 deletions .github/workflows/nightly-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ jobs:
repository: MegaMek/megamek
path: megamek

- name: Add MM Hash
run: |
cd megamek
calculatedSha=$(git rev-parse HEAD)
echo "$calculatedSha" >> ../megameklab/megameklab/docs/mm-revision.txt

- name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
uses: actions/setup-java@v4
with:
Expand All @@ -44,13 +50,18 @@ jobs:
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
build-scan-terms-of-use-agree: "yes"

- name: "Output branch information to Version file"
run: |
echo "branch=nightly" >> megamek/megamek/resources/extraVersion.properties
echo "gitHash=$(date +'%Y-%m-%d')" >> megamek/megamek/resources/extraVersion.properties

- name: Add MMLRevision file
run: |
echo ${{ github.sha }} >> megameklab/megameklab/mml-revision.txt

- name: Build with Gradle
- name: Testing Nightly
working-directory: megameklab
run: ./gradlew clean build --stacktrace --scan
run: ./gradlew testAll --stacktrace --scan

- name: Upload Test Logs on Failure
uses: actions/upload-artifact@v4
Expand All @@ -59,14 +70,19 @@ jobs:
name: ${{ matrix.os }}-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}-ci-failure-logs
path: megameklab/megameklab/build/reports/

# - name: Upload Zip Release
# uses: actions/upload-artifact@v4
# with:
# name: mml-release-zip-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
# path: ./megameklab/megameklab/build/distributions/*.zip
- name: CodeCov.io Coverage Report
uses: codecov/codecov-action@v5
with:
directory: megameklab/megameklab/build/reports/jacoco/test
fail_ci_if_error: false
verbose: true

- name: Build with Gradle
working-directory: megamek
run: ./gradlew build -x test -PextraVersion="nightly-$(date +'%Y-%m-%d')"

- name: Upload TarGZ Release
uses: actions/upload-artifact@v4
with:
name: mml-release-tgz-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
path: ./megameklab/megameklab/build/distributions/*.tar.gz
path: megameklab/megameklab/build/distributions/*.tar.gz
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@ allprojects {
}

subprojects {
Properties versionProperties = new Properties()
versionProperties.load(rootProject.file("../megamek/megamek/resources/Version.properties").newDataInputStream())
def processedVersion = String.format("%d.%02d.%02d", Integer.parseInt(versionProperties.getProperty("major")), Integer.parseInt(versionProperties.getProperty("minor")), Integer.parseInt(versionProperties.getProperty("patch")))

if (project.hasProperty("extraVersion")) {
processedVersion = String.format("%s-%s", processedVersion, project.getProperty('extraVersion'))
}

group = 'org.megamek'
version = '0.50.05-SNAPSHOT'
version = processedVersion
}

// A properties_local.gradle file can be used to override any of the above options. For instance,
Expand Down
Loading
Loading