Skip to content

Commit

Permalink
Merge pull request #3 from qtc-de/dev
Browse files Browse the repository at this point in the history
Prepare v1.2.1 Release
  • Loading branch information
qtc-de authored Jul 19, 2024
2 parents 3324d42 + 9e76c64 commit 608a8d2
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 30 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-offline-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5

- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20.x'

Expand All @@ -41,13 +41,13 @@ jobs:
npm run build -- --mode offline
- name: Archive offline frontend
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rpv-web-offline
path: 'frontend/dist'

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: 'frontend/dist'

Expand All @@ -63,4 +63,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install V
uses: vlang/setup-v@v1.3
uses: vlang/setup-v@v1.4

- name: Install mingw
run: |
Expand All @@ -33,7 +33,7 @@ jobs:
make
- name: Archive rpv-web-x64
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rpv-web-x64
path: rpv-web-x64.exe
Expand All @@ -43,10 +43,10 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install V
uses: vlang/setup-v@v1.3
uses: vlang/setup-v@v1.4

- name: Install mingw
run: |
Expand All @@ -59,7 +59,7 @@ jobs:
make rpv-web-x86
- name: Archive rpv-web-x86
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rpv-web-x86
path: rpv-web-x86.exe
Expand All @@ -72,10 +72,10 @@ jobs:

steps:
- name: Checkout ${{ github.event.repository.name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20.x'

Expand All @@ -87,17 +87,17 @@ jobs:
mv dist ../dist
- name: Download rpv-web-x64
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rpv-web-x64

- name: Download rpv-web-x86
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rpv-web-x86

- name: Archive frontend and rpv-web
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rpv-web
path: |
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## v1.2.1 - July 19, 2024

### Changed

* Fix `-pdb-path` not working with `-snapshot`


## v1.2.0 - July 17, 2024

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[![](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml)
[![](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml)
[![](https://img.shields.io/badge/version-1.2.0-blue)](https://github.com/qtc-de/rpv-web/releases)
[![](https://img.shields.io/badge/version-1.2.1-blue)](https://github.com/qtc-de/rpv-web/releases)
[![](https://img.shields.io/badge/language-v%20%26%20vue-blue)](https://vlang.io/)
[![](https://img.shields.io/badge/license-GPL%20v3.0-blue)](https://github.com/qtc-de/rpv-web/blob/master/LICENSE)
[![](https://img.shields.io/badge/Pages-fa6b05)](https://qtc-de.github.io/rpv-web/)
Expand Down
24 changes: 12 additions & 12 deletions src/main.v
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ fn main()
execute: fn [mut app] (cmd cli.Command)!
{
snapshot := cmd.flags.get_bool('snapshot') or { false }
symbol_file := cmd.flags.get_string('symbol-file') or { 'rpv-web-symbols.toml' }
pdb_path := cmd.flags.get_string('pdb-path') or { '' }

g_settings = RpvWebSettings { symbol_file: symbol_file, symbol_path: pdb_path }
g_symbol_resolver = rpv.new_resolver(g_settings.symbol_file, g_settings.symbol_path) or
{
eprintln('[-] Unable to initialize global symbol resolver: ${err}')
return
}

if snapshot
{
Expand All @@ -72,22 +81,13 @@ fn main()
{
eprintln('[-] Unable to write file ${filename}.')
}

return
}

symbol_file := cmd.flags.get_string('symbol-file') or { 'rpv-web-symbols.toml' }
pdb_path := cmd.flags.get_string('pdb-path') or { '' }

g_settings = RpvWebSettings { symbol_file: symbol_file, symbol_path: pdb_path }
g_symbol_resolver = rpv.new_resolver(g_settings.symbol_file, g_settings.symbol_path) or
else
{
eprintln('[-] Unable to initialize global symbol resolver: ${err}')
return
port := cmd.flags.get_int('port') or { 8000 }
vweb.run(app, port)
}

port := cmd.flags.get_int('port') or { 8000 }
vweb.run(app, port)
}
}

Expand Down

0 comments on commit 608a8d2

Please sign in to comment.