Skip to content

Commit d337824

Browse files
committed
Release v0.4.0
fixed a lot of bugs and imho it can be ready as a demo
1 parent 32fa60c commit d337824

6 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
echo "cp oshot /usr/local/bin/oshot" >> package/oshot/install.sh
143143
chmod +x package/oshot/install.sh package/oshot/oshot
144144
wget https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -O package/oshot/models/eng.traineddata
145-
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf
145+
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf -O package/oshot/Arial.ttf
146146
cd package
147147
zip -r oshot-linux.zip oshot/
148148
@@ -154,7 +154,7 @@ jobs:
154154
chmod +x oshot-x86_64.AppImage
155155
mv oshot-x86_64.AppImage package/oshot/
156156
wget https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -O package/oshot/models/eng.traineddata
157-
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf
157+
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf -O package/oshot/Arial.ttf
158158
cd package
159159
zip -r oshot-appimage.zip oshot/
160160
@@ -165,8 +165,8 @@ jobs:
165165
ARCH=$(uname -m)
166166
./scripts/create_app_bundle.sh ./build/oshot oshot-macos-${ARCH}.dmg
167167
mv oshot-macos-${ARCH}.dmg package/oshot/
168-
curl -L https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -o package/oshot/models/eng.traineddata
169-
curl -LO https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf
168+
curl -L https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -o package/oshot/models/eng.traineddata
169+
curl -L https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf -o package/oshot/Arial.ttf
170170
cd package
171171
zip -r oshot-macos-${ARCH}.zip oshot/
172172

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
echo "cp oshot /usr/local/bin/oshot" >> package/oshot/install.sh
147147
chmod +x package/oshot/install.sh package/oshot/oshot
148148
wget https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -O package/oshot/models/eng.traineddata
149-
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf
149+
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf -O package/oshot/Arial.ttf
150150
cd package
151151
zip -r oshot-linux.zip oshot/
152152
@@ -158,7 +158,7 @@ jobs:
158158
chmod +x oshot-x86_64.AppImage
159159
mv oshot-x86_64.AppImage package/oshot/
160160
wget https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -O package/oshot/models/eng.traineddata
161-
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf
161+
wget https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf -O package/oshot/Arial.ttf
162162
cd package
163163
zip -r oshot-appimage.zip oshot/
164164
@@ -169,8 +169,8 @@ jobs:
169169
ARCH=$(uname -m)
170170
./scripts/create_app_bundle.sh ./build/oshot oshot-macos-${ARCH}.dmg
171171
mv oshot-macos-${ARCH}.dmg package/oshot/
172-
curl -L https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -o package/oshot/models/eng.traineddata
173-
curl -LO https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf
172+
curl -L https://github.com/tesseract-ocr/tessdata/raw/main/eng.traineddata -o package/oshot/models/eng.traineddata
173+
curl -L https://github.com/matomo-org/travis-scripts/raw/refs/heads/master/fonts/Arial.ttf -o package/oshot/Arial.ttf
174174
cd package
175175
zip -r oshot-macos-${ARCH}.zip oshot/
176176
@@ -277,6 +277,6 @@ jobs:
277277
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
278278
with:
279279
upload_url: ${{ needs.release.outputs.release-url }}
280-
asset_path: downloaded-artifacts/macos-13-packages/oshot-macos-x86_64.zip
280+
asset_path: downloaded-artifacts/macos-15-intel-packages/oshot-macos-x86_64.zip
281281
asset_name: oshot-macos-x86_64-${{ needs.get-version.outputs.version }}.zip
282282
asset_content_type: application/zip

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
cmake_minimum_required(VERSION 3.15)
22

33
project(oshot VERSION 0.4.0 LANGUAGES C CXX)
4-
set(PROJECT_VERSION_SUFFIX "-rc1")
54
set(PROJECT_FULL_VERSION "${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX}")
65

76
if(APPLE)

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ endif
6262

6363
NAME = oshot
6464
TARGET ?= $(NAME)
65-
OLDVERSION = 0.3.0
66-
VERSION = 0.4.0-rc1
65+
OLDVERSION = 0.4.0-rc1
66+
VERSION = 0.4.0
6767
SRC = $(wildcard src/*.cpp)
6868
OBJ = $(SRC:.cpp=.o)
6969
LDFLAGS += -L$(BUILDDIR) $(LTO_FLAGS)

compile_flags.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-Wextra
55
-Wpedantic
66
-std=c++20
7-
-DVERSION="0.4.0-rc1"
7+
-DVERSION="0.4.0"
88
-DDEBUG=1
99
-DWINDOWS_CMD=1
1010
-DENABLE_PORTALS=1

scripts/create_app_bundle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ main() {
9393
<key>CFBundleVersion</key>
9494
<string>0.4.0</string>
9595
<key>CFBundleShortVersionString</key>
96-
<string>0.4.0-rc1</string>
96+
<string>0.4.0</string>
9797
<key>CFBundlePackageType</key>
9898
<string>APPL</string>
9999
<key>CFBundleSignature</key>

0 commit comments

Comments
 (0)