From 2152ffbc7b77dc52d8b690d189aad93f7a88c063 Mon Sep 17 00:00:00 2001 From: Tobias Neitzel Date: Fri, 19 Jul 2024 11:16:09 +0200 Subject: [PATCH 1/5] Fix -pdb-path not working when using -snapshot --- src/main.v | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main.v b/src/main.v index 32314d0..f49d372 100644 --- a/src/main.v +++ b/src/main.v @@ -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 { @@ -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) } } From 49ae71570300c00cf12543016ffa0591f60ffe92 Mon Sep 17 00:00:00 2001 From: Tobias Neitzel Date: Fri, 19 Jul 2024 11:17:21 +0200 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35e50f0..16f0f63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.X.X - July XX, 2024 + +### Changed + +* Fix `-pdb-path` not working with `-snapshot` + + ## v1.2.0 - July 17, 2024 ### Added From d3408ef6f0add78d8c1634e13c05af35281a4a20 Mon Sep 17 00:00:00 2001 From: Tobias Neitzel Date: Fri, 19 Jul 2024 11:25:50 +0200 Subject: [PATCH 3/5] Update workflow action versions --- .github/workflows/build-offline-frontend.yml | 12 +++++------ .github/workflows/build.yml | 22 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-offline-frontend.yml b/.github/workflows/build-offline-frontend.yml index 9d0d586..1a9f656 100644 --- a/.github/workflows/build-offline-frontend.yml +++ b/.github/workflows/build-offline-frontend.yml @@ -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' @@ -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' @@ -63,4 +63,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 733fe46..522cc23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | @@ -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 @@ -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: | @@ -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 @@ -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' @@ -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: | From 1b4e61e04f1fbb5bbaf0c4df9728b4c323ebb113 Mon Sep 17 00:00:00 2001 From: Tobias Neitzel Date: Fri, 19 Jul 2024 11:32:33 +0200 Subject: [PATCH 4/5] Fix invalid version number in CHANGELOG --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16f0f63..252f3ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ 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.X.X - July XX, 2024 +## v1.2.1 - July 19, 2024 ### Changed diff --git a/README.md b/README.md index ecfb3d0..3d642d5 100644 --- a/README.md +++ b/README.md @@ -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.3.0-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/) From 9e76c6441aca4afea885575d1e1221672750b11d Mon Sep 17 00:00:00 2001 From: Tobias Neitzel Date: Fri, 19 Jul 2024 11:33:08 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d642d5..31e2f94 100644 --- a/README.md +++ b/README.md @@ -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.3.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/)