mirror of
https://github.com/RipMeApp/ripme.git
synced 2025-04-20 11:52:00 +02:00
remove mvn maven build, fix #30.
This commit is contained in:
soloturn
parent
aae3f5c38c
commit
c7af5c503d
34
.github/workflows/maven.yml
vendored
34
.github/workflows/maven.yml
vendored
@ -1,34 +0,0 @@
|
||||
name: Java CI
|
||||
|
||||
on: workflow_dispatch
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, windows-latest, macOS-latest]
|
||||
java: [1.8]
|
||||
include: # test newest java on one os only, upload from ubuntu java8
|
||||
- os: ubuntu-latest
|
||||
java: 1.15
|
||||
- os: ubuntu-latest
|
||||
upload: true
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: ${{ matrix.java }}
|
||||
- name: Build with Maven
|
||||
run: mvn -B package assembly:single --file pom.xml
|
||||
- name: upload jar as asset
|
||||
if: matrix.upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: zipped-ripme-jar
|
||||
path: target/*dependencies.jar
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
@ -1,2 +1,2 @@
|
||||
mvn clean compile assembly:single
|
||||
mvn io.github.zlika:reproducible-build-maven-plugin:0.6:strip-jar
|
||||
./gradlew clean build -x test
|
||||
./gradlew testAll
|
||||
|
||||
5
build.sh
5
build.sh
@ -1,4 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
mvn clean compile assembly:single
|
||||
# Strip the jar of any non-reproducible metadata such as timestamps
|
||||
mvn io.github.zlika:reproducible-build-maven-plugin:0.6:strip-jar
|
||||
./gradlew clean build -x test
|
||||
./gradlew testAll
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
@echo off
|
||||
powershell -c ".\deploy.ps1 -source (Join-Path target (Get-Item -Path .\target\* -Filter *.jar)[0].Name) -dest ripme.jar"
|
||||
16
deploy.ps1
16
deploy.ps1
@ -1,16 +0,0 @@
|
||||
Param (
|
||||
[Parameter(Mandatory=$True)]
|
||||
[string]$source,
|
||||
[Parameter(Mandatory=$True)]
|
||||
[string]$dest
|
||||
)
|
||||
|
||||
Copy-Item -Path $source -Destination $dest
|
||||
|
||||
$sourceHash = (Get-FileHash $source -algorithm MD5).Hash
|
||||
$destHash = (Get-FileHash $dest -algorithm MD5).Hash
|
||||
if ($sourceHash -eq $destHash) {
|
||||
Write-Output 'Deployed successfully.'
|
||||
} else {
|
||||
Write-Output 'Hash Mismatch: did you close ripme before deploying?'
|
||||
}
|
||||
86
patch.py
86
patch.py
@ -1,86 +0,0 @@
|
||||
import json
|
||||
import subprocess
|
||||
from hashlib import sha256
|
||||
|
||||
# This script will:
|
||||
# - read current version
|
||||
# - increment patch version
|
||||
# - update version in a few places
|
||||
# - insert new line in ripme.json with message
|
||||
# - build ripme
|
||||
# - add the hash of the latest binary to ripme.json
|
||||
# - commit all changes
|
||||
message = input('message: ')
|
||||
|
||||
# Strip any spaces that might've been entered before the message
|
||||
message.lstrip()
|
||||
|
||||
|
||||
def get_ripme_json():
|
||||
with open('ripme.json') as dataFile:
|
||||
ripmeJson = json.load(dataFile)
|
||||
return ripmeJson
|
||||
|
||||
|
||||
def update_hash(current_hash):
|
||||
ripmeJson = get_ripme_json()
|
||||
with open('ripme.json', 'w') as dataFile:
|
||||
ripmeJson["currentHash"] = current_hash
|
||||
print(ripmeJson["currentHash"])
|
||||
json.dump(ripmeJson, dataFile, indent=4)
|
||||
|
||||
|
||||
def update_change_list(message):
|
||||
ripmeJson = get_ripme_json()
|
||||
with open('ripme.json', 'w') as dataFile:
|
||||
ripmeJson["changeList"].insert(0, message)
|
||||
json.dump(ripmeJson, dataFile, indent=4)
|
||||
|
||||
|
||||
currentVersion = get_ripme_json()["latestVersion"]
|
||||
|
||||
print('Current version ' + currentVersion)
|
||||
|
||||
versionFields = currentVersion.split('.')
|
||||
patchCur = int(versionFields[2])
|
||||
patchNext = patchCur + 1
|
||||
majorMinor = versionFields[:2]
|
||||
majorMinor.append(str(patchNext))
|
||||
nextVersion = '.'.join(majorMinor)
|
||||
|
||||
print('Updating to ' + nextVersion)
|
||||
|
||||
substrExpr = 's/' + currentVersion + '/' + nextVersion + '/'
|
||||
subprocess.call(['sed', '-i', '-e', substrExpr, 'src/main/java/com/rarchives/ripme/ui/UpdateUtils.java'])
|
||||
subprocess.call(['git', 'grep', 'DEFAULT_VERSION.*' + nextVersion,
|
||||
'src/main/java/com/rarchives/ripme/ui/UpdateUtils.java'])
|
||||
|
||||
substrExpr = 's/\\\"latestVersion\\\": \\\"' + currentVersion + '\\\"/\\\"latestVersion\\\": \\\"' + \
|
||||
nextVersion + '\\\"/'
|
||||
subprocess.call(['sed', '-i', '-e', substrExpr, 'ripme.json'])
|
||||
subprocess.call(['git', 'grep', 'latestVersion', 'ripme.json'])
|
||||
|
||||
substrExpr = 's/<version>' + currentVersion + '/<version>' + nextVersion + '/'
|
||||
subprocess.call(['sed', '-i', '-e', substrExpr, 'pom.xml'])
|
||||
subprocess.call(['git', 'grep', '<version>' + nextVersion + '</version>', 'pom.xml'])
|
||||
|
||||
commitMessage = nextVersion + ': ' + message
|
||||
|
||||
update_change_list(commitMessage)
|
||||
|
||||
|
||||
print("Building ripme")
|
||||
subprocess.call(["mvn", "clean", "compile", "assembly:single"])
|
||||
print("Stripping jar")
|
||||
subprocess.call(["mvn", "io.github.zlika:reproducible-build-maven-plugin:0.6:strip-jar"])
|
||||
print("Hashing .jar file")
|
||||
openedFile = open("./target/ripme-{}-jar-with-dependencies.jar".format(nextVersion), "rb")
|
||||
readFile = openedFile.read()
|
||||
file_hash = sha256(readFile).hexdigest()
|
||||
print("Hash is: {}".format(file_hash))
|
||||
print("Updating hash")
|
||||
update_hash(file_hash)
|
||||
subprocess.call(['git', 'add', '-u'])
|
||||
subprocess.call(['git', 'commit', '-m', commitMessage])
|
||||
subprocess.call(['git', 'tag', nextVersion])
|
||||
print("Remember to run `git push origin master` before release.py")
|
||||
176
pom.xml
176
pom.xml
@ -1,176 +0,0 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.rarchives.ripme</groupId>
|
||||
<artifactId>ripme</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.7.94</version>
|
||||
<name>ripme</name>
|
||||
<url>http://rip.rarchives.com</url>
|
||||
<properties>
|
||||
<excludedGroups>flaky</excludedGroups>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.junit</groupId>
|
||||
<artifactId>junit-bom</artifactId>
|
||||
<version>5.6.2</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.vintage</groupId>
|
||||
<artifactId>junit-vintage-engine</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- jsoup HTML parser library @ http://jsoup.org/ -->
|
||||
<groupId>org.jsoup</groupId>
|
||||
<artifactId>jsoup</artifactId>
|
||||
<version>1.8.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.graalvm.js</groupId>
|
||||
<artifactId>js</artifactId>
|
||||
<version>20.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
<version>20190722</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>2.14.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>2.14.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>1.3.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
<version>4.3.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpmime</artifactId>
|
||||
<version>4.3.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.java-websocket</groupId>
|
||||
<artifactId>Java-WebSocket</artifactId>
|
||||
<version>1.5.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.7.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>io.github.zlika</groupId>
|
||||
<artifactId>reproducible-build-maven-plugin</artifactId>
|
||||
<version>0.6</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>com.rarchives.ripme.App</mainClass>
|
||||
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<Class-Path>./config</Class-Path>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eluder.coveralls</groupId>
|
||||
<artifactId>coveralls-maven-plugin</artifactId>
|
||||
<version>4.3.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<!-- At time of writing: JaCoCo is (allegedly) the only coverage report generator that supports Java 8 -->
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.6</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>prepare-agent</id>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
<configuration>
|
||||
<excludedGroups>${excludedGroups}</excludedGroups>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-report-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
<configuration>
|
||||
<showSuccess>false</showSuccess>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
</project>
|
||||
Loading…
x
Reference in New Issue
Block a user