refactor/versioning #12

BrunnerLivio · 2018-07-09T16:09:46Z

Fix for issue #11

BrunnerLivio · 2018-07-09T16:13:08Z

bin/add-version.sh


-docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"
+java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"


Getting the error

Usage: java [-options] class [args...] (to execute a class) or java [-options] -jar jarfile [args...] (to execute a jar file) ...

@celandro you know how I the command should be called correctly to generate the GAME_MASTER.json?

BrunnerLivio · 2018-07-09T16:26:35Z

bin/add-version.sh


-docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"
+java -cp target/pokemongo-game-master-2.28.1.jar com.pokebattler.gamemaster.GenerateJSON "${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"


I get the following error:

Error: Could not find or load main class com.pokebattler.gamemaster.GenerateJSON

Anyone knows a fix? @celandro

by calling

docker build -t "$USER/pokemongo-game-master" . docker run \ -v versions:/var/lib/pokemongo-game-master/versions \ -it "$USER/pokemongo-game-master" \ -f ./versions/0.57.1/GAME_MASTER.protobuf -v "0.69.9"

celandro · 2018-07-09T17:16:22Z

I can look tonight. But you probably aren't including the jar file

…

On Mon, Jul 9, 2018, 9:48 AM Livio Brunner ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In bin/add-version.sh <#12 (comment)> : > -docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json" +java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json" Getting the error Usage: java [-options] class [args...] (to execute a class) or java [-options] -jar jarfile [args...] (to execute a jar file) ... @celandro <https://github.com/celandro> you know how I the command should be called correctly to generate the GAME_MASTER.json? ------------------------------ In bin/add-version.sh <#12 (comment)> : > -docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json" +java -cp target/pokemongo-game-master-2.28.1.jar com.pokebattler.gamemaster.GenerateJSON "${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json" I get the following error: Error: Could not find or load main class com.pokebattler.gamemaster.GenerateJSON Anyone knows a fix? by calling docker build -t "$USER/pokemongo-game-master" . docker run \ -v versions:/var/lib/pokemongo-game-master/versions \ -it "$USER/pokemongo-game-master" \ -f ./versions/0.57.1/GAME_MASTER.protobuf -v "0.69.9" — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#12 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAX4gD3HbY-7-mpaR04obluL5TdhrjKeks5uE4lggaJpZM4VH_OG> .

BrunnerLivio · 2018-07-10T08:30:54Z

@celandro I've fixed it, but it is not really efficient at the moment. I'm currently calling mvn clean package inside the bin/add-version.sh file. The build process should be inside the Dockerfile, but somehow I could not get it running because of the exec: part. Not really a java expert, maybe you know the issue.

BrunnerLivio · 2018-07-10T08:53:02Z

I've changed the add-version.sh script so it will generate the current timestamp and set it as version number.

For example, when calling the docker run script, it will create a new folder with the current timestamp e.g. 20180710083743 (= "+%Y%m%d%H%M%S"). You can change the timestamp by setting the -t parameter. If --latest is set, it will automatically update the latest-version.txt and copy the files to the latest folder.

BrunnerLivio · 2018-07-15T17:55:25Z

Can someone review this PR? @celandro @dandesousa

celandro

I think getting the timestamp out of the file is pretty important so it will be consistent if run on any machine with the same proto file

celandro · 2018-07-16T15:12:12Z

bin/add-version.sh

 done

 if [ "${PROTOBUF_FILE}" == "" ]; then
    print_error_and_exit "Missing protobuf file"
 fi

-if [ "${VERSION_TO_ADD}" == "" ]; then
-    print_error_and_exit "Missing version to add"
+if [ "${TIMESTAMP}" == "" ]; then


would be better if the timestamp was grepped out of the file

Oh missunderstood this. I thought we should not use the timestamp of the GAME_MASTER file. But it makes more sense this way, will change that

celandro · 2018-07-16T15:12:28Z

CONTRIBUTING.md

+## Generate GAME_MASTER.json
+
+You can generate a new GAME_MASTER.json using the following command.
+It will create a new folder `versions/0.69.9`.


this is now datestamp based not niantic versions

BrunnerLivio · 2018-07-25T09:18:16Z

Can you review it again @celandro ?

celandro

LGTM

celandro · 2018-07-25T15:40:21Z

CONTRIBUTING.md

+  -v "$HOME/.gitconfig:/root/.gitconfig" \
+  -it "$USER/pokemongo-game-master" \
+  -f /var/lib/pokemongo-game-master/GAME_MASTER.protobuf --latest
+


I will add a windows version of this command when I have time. The syntax for current and home directory is a little different

Would be nice if you can do that. Do not want to bother around with windows if I don't have to :)

BrunnerLivio changed the title ~~refactor/versioning~~ [DO-NOT-MERGE] refactor/versioning Jul 9, 2018

BrunnerLivio mentioned this pull request Jul 9, 2018

Versioning is inconstistent #11

Closed

BrunnerLivio commented Jul 9, 2018

View reviewed changes

BrunnerLivio requested review from celandro and dandesousa July 10, 2018 08:54

BrunnerLivio added 5 commits July 10, 2018 12:41

Add Dockerfile

21e06bb

Update README description

34f6f95

Fix docker container

6b8d418

Change to timestamp instead of version number

3a3ff5a

Update test case for timestamp

0358bd1

BrunnerLivio force-pushed the refactor/version-numbers branch from 0b3fe61 to 3476932 Compare July 10, 2018 10:50

BrunnerLivio changed the title ~~[DO-NOT-MERGE] refactor/versioning~~ refactor/versioning Jul 10, 2018

celandro requested changes Jul 16, 2018

View reviewed changes

Add automatic git tag and commit

82c20e0

BrunnerLivio force-pushed the refactor/version-numbers branch from 3476932 to 82c20e0 Compare July 25, 2018 08:33

BrunnerLivio added 3 commits July 25, 2018 10:40

Update test

f817135

Rename old versions

d14c100

Update contributing file

0a3355c

celandro approved these changes Jul 25, 2018

View reviewed changes

BrunnerLivio mentioned this pull request Jul 25, 2018

Add docker support for windows #14

Open

BrunnerLivio merged commit 5200096 into master Jul 25, 2018

Furtif deleted the refactor/version-numbers branch July 27, 2019 18:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor/versioning #12

refactor/versioning #12

BrunnerLivio commented Jul 9, 2018 •

edited

Loading

BrunnerLivio Jul 9, 2018

BrunnerLivio Jul 9, 2018 •

edited

Loading

celandro commented Jul 9, 2018 via email

BrunnerLivio commented Jul 10, 2018

BrunnerLivio commented Jul 10, 2018

BrunnerLivio commented Jul 15, 2018

celandro left a comment

celandro Jul 16, 2018

BrunnerLivio Jul 16, 2018

celandro Jul 16, 2018

BrunnerLivio commented Jul 25, 2018

celandro left a comment

celandro Jul 25, 2018

BrunnerLivio Jul 25, 2018


		docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"
		java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"


		docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"
		java -cp target/pokemongo-game-master-2.28.1.jar com.pokebattler.gamemaster.GenerateJSON "${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"

refactor/versioning #12

refactor/versioning #12

Conversation

BrunnerLivio commented Jul 9, 2018 • edited Loading

BrunnerLivio Jul 9, 2018

Choose a reason for hiding this comment

BrunnerLivio Jul 9, 2018 • edited Loading

Choose a reason for hiding this comment

celandro commented Jul 9, 2018 via email

BrunnerLivio commented Jul 10, 2018

BrunnerLivio commented Jul 10, 2018

BrunnerLivio commented Jul 15, 2018

celandro left a comment

Choose a reason for hiding this comment

celandro Jul 16, 2018

Choose a reason for hiding this comment

BrunnerLivio Jul 16, 2018

Choose a reason for hiding this comment

celandro Jul 16, 2018

Choose a reason for hiding this comment

BrunnerLivio commented Jul 25, 2018

celandro left a comment

Choose a reason for hiding this comment

celandro Jul 25, 2018

Choose a reason for hiding this comment

BrunnerLivio Jul 25, 2018

Choose a reason for hiding this comment

BrunnerLivio commented Jul 9, 2018 •

edited

Loading

BrunnerLivio Jul 9, 2018 •

edited

Loading