Skip to content

Commit

Permalink
fix deploy remove deb rpm (#2007)
Browse files Browse the repository at this point in the history
* remove cert file dependency and fix release

Signed-off-by: sriv <srikanth.ddit@gmail.com>

* fix deploy scripts

darwin_amd64 packaging fix

remove deb/rpm publish, bintray is gone

fix brew release, typo in script

Signed-off-by: sriv <srikanth.ddit@gmail.com>

* rename stage, we're no longer signing

Signed-off-by: sriv <srikanth.ddit@gmail.com>
  • Loading branch information
sriv authored May 26, 2021
1 parent 93bd0af commit fa7918b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 65 deletions.
60 changes: 1 addition & 59 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
go run build/make.go --verbose --all-platforms
Get-ChildItem -Recurse .\bin
- name: Sign
- name: Create Distro
shell: pwsh
run: |
go run build/make.go --distro --bin-dir bin\windows_amd64
Expand Down Expand Up @@ -185,64 +185,6 @@ jobs:
npm version $GAUGE_VERSION
npm publish --access=public
deb-rpm-release:
needs: [github-release]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set up Go 1.16
uses: actions/setup-go@v1
with:
go-version: 1.16
id: go

- name: Set up Ruby 2.6.x
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x

- name: Install fpm
run: |
gem install --no-document fpm
- name: Prepare deb artifact
run: |
build/mkdeb.sh
- name: Deploy debian
env:
REPO: gauge-deb
PACKAGE: gauge
DISTRIBUTIONS: stable
COMPONENTS: main
USER: ${{ secrets.BINTRAY_API_USER }}
API_KEY: ${{ secrets.BINTRAY_API_KEY }}
PASSPHRASE: ${{ secrets.BINTRAY_GPG_SIGNING_PASSPHRASE }}
run: |
cd deploy
sh ../build/publish_deb_to_bintray.sh
- name: Deploy rpm
env:
REPO: gauge-rpm
PACKAGE: gauge
BINTRAY_PACKAGE: gauge-stable
USER: ${{ secrets.BINTRAY_API_USER }}
API_KEY: ${{ secrets.BINTRAY_API_KEY }}
PASSPHRASE: ${{ secrets.BINTRAY_GPG_SIGNING_PASSPHRASE }}
run: |
cd deploy
for artifact in `ls gauge-*.deb`; do
fpm -t rpm -s deb $artifact
done
for artifact in `ls gauge-*.rpm`; do
output_package=`echo "$artifact" | sed 's/-[0-9].x/-all.x/' | sed 's/-[0-9].i/-all.i/'`
mv -T $artifact $output_package
done
ls
sh ../build/publish_rpm_to_bintray.sh
choco-release:
needs: [github-release]
runs-on: windows-latest
Expand Down
2 changes: 1 addition & 1 deletion build/brew/create_brew_pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ git branch -D $BRANCH || true
git checkout -b $BRANCH

gem install parser
ruby ./brew_update.rb $GAUGE_VERSION ./Formula/gauge.rb
ruby ../brew_update.rb $GAUGE_VERSION ./Formula/gauge.rb

git add ./Formula/gauge.rb
git commit -m "gauge $GAUGE_VERSION"
Expand Down
8 changes: 4 additions & 4 deletions build/make.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,14 @@ func signExecutable(exeFilePath string, certFilePath string) {
}

func createDarwinPackage() {
distroDir := filepath.Join(deploy, gauge)
distroDir := filepath.Join(deploy, packageName())
copyGaugeBinaries(distroDir)
if id := os.Getenv("OS_SIGNING_IDENTITY"); id == "" {
log.Printf("No singning identity found . Executable won't be signed.")
log.Printf("No signing identity found . Executable won't be signed.")
} else {
runProcess("codesign", "-s", id, "--force", "--deep", filepath.Join(distroDir, gauge))
}
createZipFromUtil(deploy, gauge, packageName())
createZipFromUtil(deploy, packageName(), packageName())
if err := os.RemoveAll(distroDir); err != nil {
log.Printf("failed to remove %s", distroDir)
}
Expand Down Expand Up @@ -442,7 +442,7 @@ func getPackageArchSuffix() string {
return "x86_64"
}

if arch := getGOARCH(); arch == "arm" {
if arch := getGOARCH(); arch == "arm64" {
return "arm64"
}

Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

// CurrentGaugeVersion represents the current version of Gauge
var CurrentGaugeVersion = &Version{1, 2, 0}
var CurrentGaugeVersion = &Version{1, 2, 1}

// BuildMetadata represents build information of current release (e.g, nightly build information)
var BuildMetadata = ""
Expand Down

0 comments on commit fa7918b

Please sign in to comment.