summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2023-11-28 21:50:23 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2023-11-28 21:51:08 +0100
commitbb12cf0b8c95497302e0d5450e481713366e5115 (patch)
treedf7384f6414f3aae0477c704fb3f3d1d3e3735e3
parentec28ce94d85d31ff356ecc389ad5a18782f062b2 (diff)
Let's see if it works with new versions and no Greek
-rw-r--r--.github/workflows/build.yml26
-rw-r--r--localization/localization_ro_RO.ts (renamed from localization/localization_ro.ts)0
-rw-r--r--qtpass.iss1
-rw-r--r--src/src.pro1
4 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23c118f5..e139a720 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,15 +1,21 @@
name: Build and Release
-on: [push, pull_request]
+on:
+ pull_request:
+ branches:
+ - main
+ push:
+ tags:
+ - 'v*'
jobs:
build-windows:
runs-on: windows-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- uses: ilammy/msvc-dev-cmd@v1
- name: Setup Qt environment
- uses: jurplel/install-qt-action@v2
+ uses: jurplel/install-qt-action@v3
with:
version: '5.15.2'
- name: Build QtPass
@@ -23,23 +29,17 @@ jobs:
- name: Create Installer with Inno Setup
run: ISCC.exe qtpass.iss
- name: Upload Artifact
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: PyQtPass-Windows
path: release
- - name: Upload Release Asset
- uses: softprops/action-gh-release@v1
- with:
- files: Output\qtpass-*.exe
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
build-mac:
runs-on: macos-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Setup Qt environment
- uses: jurplel/install-qt-action@v2
+ uses: jurplel/install-qt-action@v3
with:
version: '5.15.2'
- name: Build QtPass
@@ -48,7 +48,7 @@ jobs:
make
macdeployqt main/QtPass.app
- name: Upload Artifact
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: PyQtPass-macOS
path: macdeployqt main/QtPass.app
diff --git a/localization/localization_ro.ts b/localization/localization_ro_RO.ts
index e5929945..e5929945 100644
--- a/localization/localization_ro.ts
+++ b/localization/localization_ro_RO.ts
diff --git a/qtpass.iss b/qtpass.iss
index 4a9f62ac..7d6cbac3 100644
--- a/qtpass.iss
+++ b/qtpass.iss
@@ -41,7 +41,6 @@ Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
diff --git a/src/src.pro b/src/src.pro
index 63f76664..b9c47c16 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -41,6 +41,7 @@ TRANSLATIONS += ../localization/localization_ar_MA.ts \
../localization/localization_cy_GB.ts \
../localization/localization_hr_HR.ts \
../localization/localization_af_ZA.ts \
+ ../localization/localization_ro_RO.ts \
../localization/localization_sl_SI.ts \
../localization/localization_sr_RS.ts \
../localization/localization_ja_JA.ts \