Skip to content

Commit

Permalink
ci: test
Browse files Browse the repository at this point in the history
  • Loading branch information
cristianciutea committed Sep 8, 2021
1 parent 6308f35 commit 716e1a0
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 48 deletions.
84 changes: 42 additions & 42 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/assembly/targz.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>bin</id>
<id>targz</id>
<formats>
<format>tar.gz</format>
</formats>
Expand Down
2 changes: 1 addition & 1 deletion build/assembly/zip.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>bin</id>
<id>zip</id>
<formats>
<format>zip</format>
</formats>
Expand Down
2 changes: 1 addition & 1 deletion build/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build/ci.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>create-archive</id>
<id>create-targz</id>
<configuration>
<finalName>${project.artifactId}_linux_${project.version}_noarch</finalName>
<appendAssemblyId>false</appendAssemblyId>
Expand All @@ -165,7 +165,7 @@
</goals>
</execution>
<execution>
<id>create-archive-zip</id>
<id>create-zip</id>
<configuration>
<finalName>${project.artifactId}_windows_${project.version}_noarch</finalName>
<appendAssemblyId>false</appendAssemblyId>
Expand Down

0 comments on commit 716e1a0

Please sign in to comment.