Skip to content

Commit

Permalink
v.mod based releases (#3)
Browse files Browse the repository at this point in the history
* Update vlang.yml

* Update vlang.yml

* Update vlogql.v

* Update vlang.yml

* Update v.mod

* Update vlang.yml

* Update vlogql.yaml

* Update vlang.yml

* Update vlogql.yaml
  • Loading branch information
lmangani authored Mar 19, 2022
1 parent e9830b5 commit b1f43e0
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 15 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/vlang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ name: vlang-build-pipeline

on:
push:
branches: [ master, main ]
paths-ignore:
- '**.md'
pull_request:
branches: [ master, main ]

jobs:
run:
Expand All @@ -22,20 +25,27 @@ jobs:
run: v -o vlogql -prod vlogql.v
# - name: Run V tests
# run: v test .
- name: Retrieve v.mod version
run: |
echo TAG_NAME=$(cat v.mod | grep version | awk -F"'" '{print $2}') >> $GITHUB_ENV
- name: NFPM DEB
if: github.event_name != 'pull_request'
uses: skynet-core/[email protected]
id: deb-package
env:
VERSION: ${{ env.TAG_NAME }}
with:
target: vlogql.deb
target: vlogql_v${{ env.TAG_NAME }}.deb
config: "vlogql.yaml"
packager: "deb"
- name: NFPM RPM
if: github.event_name != 'pull_request'
uses: skynet-core/[email protected]
id: rpm-package
env:
VERSION: ${{ env.TAG_NAME }}
with:
target: vlogql.rpm
target: vlogql_v${{ env.TAG_NAME }}.rpm
config: "vlogql.yaml"
packager: "rpm"
- name: Get Time
Expand All @@ -53,10 +63,10 @@ jobs:
with:
release_config: |
vlogql
vlogql.deb
vlogql.rpm
vlogql_v${{ env.TAG_NAME }}.deb
vlogql_v${{ env.TAG_NAME }}.rpm
tag_name: v${{ steps.time.outputs.time }}
release_name: vlogql_${{ steps.time.outputs.time }}
release_name: vlogql_v${{ env.TAG_NAME }}_${{ steps.time.outputs.time }}
draft: false
prerelease: false
overwrite: true
2 changes: 1 addition & 1 deletion v.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Module {
name: 'vlogql'
description: 'LogQL Query CLI'
version: '0.1.4'
version: '0.1.5'
license: 'MIT'
dependencies: []
}
13 changes: 5 additions & 8 deletions vlogql.v
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import term
import time
import net.http
import net.websocket
//import v.vmod
import v.vmod

struct Response {
mut:
Expand Down Expand Up @@ -129,13 +129,10 @@ fn tail_logs(server string, query string, show_labels bool) ? {

fn main() {
mut fp := flag.new_flag_parser(os.args)
//mod := vmod.from_file('./v.mod') or { panic(err) }
//fp.application(mod.name)
//fp.version(mod.version)
//fp.description(mod.description)
fp.application('vlogql')
fp.description('LogQL Query CLI')
fp.version('0.1.4')
vm := vmod.decode( @VMOD_FILE ) or { panic(err.msg) }
fp.application('$vm.name')
fp.description('$vm.description')
fp.version('$vm.version')
fp.skip_executable()
env_limit := set_value(os.getenv('LOGQL_LIMIT')) or { '5' }
logql_limit := fp.int('limit', `l`, env_limit.int(), 'logql query limit [LOGQL_LIMIT]')
Expand Down
2 changes: 1 addition & 1 deletion vlogql.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "vloqql"
arch: "amd64"
platform: "linux"
version: "v0.1.4"
version: "v${VERSION}"
section: "default"
priority: "extra"
replaces:
Expand Down

0 comments on commit b1f43e0

Please sign in to comment.