diff --git a/.github/workflows/relaseNewVersion.yml b/.github/workflows/relaseNewVersion.yml index 8201007..735f932 100644 --- a/.github/workflows/relaseNewVersion.yml +++ b/.github/workflows/relaseNewVersion.yml @@ -1,10 +1,9 @@ name: Release new Version on: pull_request: - branches: - - 'release/*' - types: - - closed + branches: ["release/*", "master"] + #types: + # - closed create: branches: - 'release/*' @@ -30,37 +29,17 @@ jobs: with: maven-version: 3.8.2 - - name: Run the Maven verify phase - run: mvn --batch-mode --update-snapshots verify - working-directory: Backend - - name: Build with Maven run: mvn -B package --file pom.xml working-directory: Backend + - run: mkdir release && ls + - name: Archive dist folder - run: cp Backend/target/schafkopf-backend-build-jar-with-dependencies.jar release && zip -r dist.zip release/* + run: cp Backend/target/schafkopf-backend-build-jar-with-dependencies.jar release/schafkopf-bot.jar && zip -r dist.zip release/schafkopf-bot.jar - - name: Get current Version Number - run: echo "version=$(node -p "require('./fcf-frontend/package.json').version")" >> $GITHUB_ENV - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.PAT }} + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') with: - tag_name: ${{ env.version }} - release_name: Release ${{ env.version }} - body: "Test" - draft: false - prerelease: false - - - name: Upload Release Asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.PAT }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist.zip - asset_name: release_files.zip - asset_content_type: application/zip + files: dist.zip diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file