From 9ecdc6b0d80d6b78413a263d664a7320e407d96e Mon Sep 17 00:00:00 2001 From: Keith Johnson Date: Sun, 26 Jun 2022 13:43:41 -0500 Subject: [PATCH 1/8] Initial maven configs? --- assembly.xml | 14 ++++++++++++++ pom.xml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 assembly.xml create mode 100644 pom.xml diff --git a/assembly.xml b/assembly.xml new file mode 100644 index 0000000..abb2f6c --- /dev/null +++ b/assembly.xml @@ -0,0 +1,14 @@ + + distribution + + jar + + + + publish/win-x64/semgus-parser.exe + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..4538e01 --- /dev/null +++ b/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + org.semgus + parser + 1.0-SNAPSHOT + + + + + maven-assembly-plugin + 3.3.0 + + + assembly.xml + + + + + + + + + github + GitHub Packages + https://maven.pkg.github.com/SemGuS-git/Semgus-Parser + + + + From 8d6315be3621c5ca5a7cb79659059b08faeecce0 Mon Sep 17 00:00:00 2001 From: Keith Johnson Date: Sun, 26 Jun 2022 13:55:39 -0500 Subject: [PATCH 2/8] Pack assets directory --- assembly.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assembly.xml b/assembly.xml index abb2f6c..2848dc1 100644 --- a/assembly.xml +++ b/assembly.xml @@ -5,10 +5,10 @@ jar - - - publish/win-x64/semgus-parser.exe - - - + + + assets + bin + + From a01c02fc21eba71a9da74fc93ca53e96ed023607 Mon Sep 17 00:00:00 2001 From: kjcjohnson Date: Sun, 26 Jun 2022 13:57:01 -0500 Subject: [PATCH 3/8] Try build maven package --- .github/workflows/dotnet.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index fb00441..56ec0d3 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -105,6 +105,37 @@ jobs: name: nupkg path: ./nupkg/*.*nupkg + maven: + runs-on: ubuntu-latest + needs: [publish] + + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + + - uses: actions/download-artifact@v3 + with: + path: assets + + - name: Prep Assets + run: | + for asset_folder in assets/*; do + rm -f "${asset_folder}"/*.pdb + find "${asset_folder}" -type f ! -name '*.*' -print -exec chmod a+x {} \; + done + + - name: Publish package + run: mvn --batch-mode clean assembly:single deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + release: runs-on: ubuntu-latest needs: [pack, publish] From a4c134bf0fd230d0a3a8ec02c848a4bb1678d655 Mon Sep 17 00:00:00 2001 From: kjcjohnson Date: Sun, 26 Jun 2022 14:13:21 -0500 Subject: [PATCH 4/8] Clean file path name --- .github/workflows/dotnet.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 56ec0d3..c1197f3 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -129,6 +129,9 @@ jobs: for asset_folder in assets/*; do rm -f "${asset_folder}"/*.pdb find "${asset_folder}" -type f ! -name '*.*' -print -exec chmod a+x {} \; + parent="$(dirname "${asset_folder}")" + folder="$(basename "${asset_folder}")" + mv "${parent}/${folder}" "${parent}/${folder/#semgus-parser-}" done - name: Publish package From 81891b1956089f4ee8964a9e354cd0ecff2fac80 Mon Sep 17 00:00:00 2001 From: kjcjohnson Date: Sun, 26 Jun 2022 14:19:36 -0500 Subject: [PATCH 5/8] Guard move --- .github/workflows/dotnet.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index c1197f3..fef23e4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -131,7 +131,9 @@ jobs: find "${asset_folder}" -type f ! -name '*.*' -print -exec chmod a+x {} \; parent="$(dirname "${asset_folder}")" folder="$(basename "${asset_folder}")" - mv "${parent}/${folder}" "${parent}/${folder/#semgus-parser-}" + if [[ "${folder}" == semgus-parser-* ]]; then + mv "${parent}/${folder}" "${parent}/${folder/#semgus-parser-}" + fi done - name: Publish package From 3c6192c5a127abde9297096655b7ed2a37e594a1 Mon Sep 17 00:00:00 2001 From: Keith Johnson Date: Sun, 26 Jun 2022 14:48:34 -0500 Subject: [PATCH 6/8] Set version on build --- .github/workflows/dotnet.yml | 9 ++++++++- pom.xml | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index fef23e4..f033511 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -137,7 +137,14 @@ jobs: done - name: Publish package - run: mvn --batch-mode clean assembly:single deploy + run: | + refArray=(${GITHUB_REF//\// }) + if [ "${refArray[1]}" == "tags" ]; then + VERSION="${refArray[2]/v}" + else + VERSION="0.0.${GITHUB_RUN_ATTEMPT}-r${GITHUB_SHA}" + fi + mvn -Drevision="$VERSION" --batch-mode clean assembly:single deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/pom.xml b/pom.xml index 4538e01..67fb1b7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,12 @@ org.semgus parser - 1.0-SNAPSHOT + ${revision} + + 1.0-SNAPSHOT + + From fd447652a820f4a6de72032180aa371217670ff6 Mon Sep 17 00:00:00 2001 From: Keith Johnson Date: Sun, 26 Jun 2022 14:49:18 -0500 Subject: [PATCH 7/8] Classifier is now bin --- assembly.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assembly.xml b/assembly.xml index 2848dc1..9cc759b 100644 --- a/assembly.xml +++ b/assembly.xml @@ -1,7 +1,7 @@ - distribution + bin jar From 61644a3d58488c7f7604cc4772b937e6b83a32ff Mon Sep 17 00:00:00 2001 From: kjcjohnson Date: Sun, 26 Jun 2022 14:51:02 -0500 Subject: [PATCH 8/8] Tab to spaces --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f033511..fce2338 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -144,7 +144,7 @@ jobs: else VERSION="0.0.${GITHUB_RUN_ATTEMPT}-r${GITHUB_SHA}" fi - mvn -Drevision="$VERSION" --batch-mode clean assembly:single deploy + mvn -Drevision="$VERSION" --batch-mode clean assembly:single deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}