From 716e1a0b454fc1d37da11c81438f029bc0af0ed5 Mon Sep 17 00:00:00 2001 From: cristianciutea Date: Wed, 8 Sep 2021 17:57:54 +0200 Subject: [PATCH] ci: test --- .github/workflows/prerelease.yml | 84 ++++++++++++++++---------------- build/assembly/targz.xml | 2 +- build/assembly/zip.xml | 2 +- build/build.mk | 2 +- build/ci.mk | 2 +- pom.xml | 4 +- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 8a683a43..41e212ff 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -24,25 +24,25 @@ env: AWS_REGION: "us-east-1" jobs: - unit-test-linux: - name: Linux unit tests - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v2 - - - name: Install Go - uses: actions/setup-go@v2 - with: - go-version: ${{env.GO_VERSION}} - - - name: Running unit tests - run: make ci/test +# unit-test-linux: +# name: Linux unit tests +# runs-on: ubuntu-20.04 +# +# steps: +# - uses: actions/checkout@v2 +# +# - name: Install Go +# uses: actions/setup-go@v2 +# with: +# go-version: ${{env.GO_VERSION}} +# +# - name: Running unit tests +# run: make ci/test packaging-linux: name: Build and upload all artifacts into GH Release assets runs-on: ubuntu-20.04 - needs: [unit-test-linux] +# needs: [unit-test-linux] steps: - uses: actions/checkout@v2 @@ -56,33 +56,33 @@ jobs: - name: Releasing linux packages run: make ci/release - packaging-Windows: - name: Windows MSI build - runs-on: windows-latest - needs: [ packaging-linux ] - - strategy: - matrix: - goarch: [ amd64, 386 ] - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Get PFX certificate from GH secrets - shell: bash - run: printf "%s" "$PFX_CERTIFICATE_BASE64" | base64 -d - > wincert.pfx - - - name: Import PFX certificate - shell: pwsh - run: build\windows\import_certificates.ps1 -pfx_passphrase "$env:PFX_PASSPHRASE" -pfx_certificate_description "$env:PFX_CERTIFICATE_DESCRIPTION" - - - name: Build executables ${{ matrix.goarch }} - shell: pwsh - run: build\windows\package_msi.ps1 -arch ${{ matrix.goarch }} -tag ${{env.TAG}} -skipSigning #Remove skipSigning - - - name: Upload MSI to GH - shell: bash - run: build/upload_artifacts_gh.sh +# packaging-Windows: +# name: Windows MSI build +# runs-on: windows-latest +# needs: [ packaging-linux ] +# +# strategy: +# matrix: +# goarch: [ amd64, 386 ] +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# +# - name: Get PFX certificate from GH secrets +# shell: bash +# run: printf "%s" "$PFX_CERTIFICATE_BASE64" | base64 -d - > wincert.pfx +# +# - name: Import PFX certificate +# shell: pwsh +# run: build\windows\import_certificates.ps1 -pfx_passphrase "$env:PFX_PASSPHRASE" -pfx_certificate_description "$env:PFX_CERTIFICATE_DESCRIPTION" +# +# - name: Build executables ${{ matrix.goarch }} +# shell: pwsh +# run: build\windows\package_msi.ps1 -arch ${{ matrix.goarch }} -tag ${{env.TAG}} -skipSigning #Remove skipSigning +# +# - name: Upload MSI to GH +# shell: bash +# run: build/upload_artifacts_gh.sh # publishing-to-s3: # name: Publish linux artifacts into s3 staging bucket diff --git a/build/assembly/targz.xml b/build/assembly/targz.xml index 9369f7d0..b8533390 100644 --- a/build/assembly/targz.xml +++ b/build/assembly/targz.xml @@ -1,7 +1,7 @@ - bin + targz tar.gz diff --git a/build/assembly/zip.xml b/build/assembly/zip.xml index 01e9ca62..fb1888f8 100644 --- a/build/assembly/zip.xml +++ b/build/assembly/zip.xml @@ -1,7 +1,7 @@ - bin + zip zip diff --git a/build/build.mk b/build/build.mk index bc253e22..dfcc7eab 100644 --- a/build/build.mk +++ b/build/build.mk @@ -5,7 +5,7 @@ build: .PHONY : package package: @($(MAVEN_BIN) versions:set -DnewVersion=\$(subst v,,$(TAG))) - @($(MAVEN_BIN) clean -DskipTests package) + @($(MAVEN_BIN) clean -DskipTests package -DskipTests -P \!deb,\!rpm,\!test) .PHONY : test test: diff --git a/build/ci.mk b/build/ci.mk index a2d6b095..4e7b5ff8 100644 --- a/build/ci.mk +++ b/build/ci.mk @@ -30,7 +30,7 @@ publish: @echo "=== [release/publish] publishing artifacts" @bash $(CURDIR)/build/upload_artifacts_gh.sh -release: package sign publish +release: package @echo "=== [release] full pre-release cycle complete for nix" .PHONY : ci/release diff --git a/pom.xml b/pom.xml index ff912b3b..cd50b1bf 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ maven-assembly-plugin - create-archive + create-targz ${project.artifactId}_linux_${project.version}_noarch false @@ -165,7 +165,7 @@ - create-archive-zip + create-zip ${project.artifactId}_windows_${project.version}_noarch false