Skip to content

Commit

Permalink
Merge branch 'master' into feat/git_friendly_settings
Browse files Browse the repository at this point in the history
  • Loading branch information
woelper committed Sep 1, 2024
2 parents 297abe1 + dff337f commit e255560
Show file tree
Hide file tree
Showing 33 changed files with 2,836 additions and 2,539 deletions.
53 changes: 0 additions & 53 deletions .github/workflows/build_checks.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/check_arm7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: cargo install cross

- name: Cross-compile arm
run: cross check --target armv7-unknown-linux-gnueabihf --no-default-features
run: cross check --target armv7-unknown-linux-gnueabihf --no-default-features --features notan/glsl-to-spirv

- name: Check output
run: ls target/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check_netbsd_minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
usesh: true
copyback: false
prepare: |
/usr/sbin/pkg_add curl pkg-config cmake openssl libX11 fontconfig freetype2 gdk-pixbuf2 cairo pango atk glib2 libXrender libxcb nasm perl
/usr/sbin/pkg_add curl pkg-config cmake openssl libX11 fontconfig freetype2 gdk-pixbuf2 cairo pango atk glib2 libXrender libxcb nasm perl git python39 ninja
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
run: |
PATH=$HOME/.cargo/bin:$PATH
export PATH
cargo check --no-default-features
cargo check --no-default-features --features notan/glsl-to-spirv
2 changes: 1 addition & 1 deletion .github/workflows/check_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: Check without default features
run: cargo check --no-default-features
run: cargo check --no-default-features --features notan/shaderc

# - name: Check with build features
# run: cargo check --features heif
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check_ubuntu_no_default_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
# run: cargo build

- name: cargo check without default features
run: cargo check --no-default-features
run: cargo check --no-default-features --features notan/glsl-to-spirv

- name: cargo check without build features
run: PKG_CONFIG_PATH=libheif/build cargo check --features heif
- name: cargo check with heif
run: PKG_CONFIG_PATH=libheif/build cargo check --features heif --features notan/glsl-to-spirv

27 changes: 21 additions & 6 deletions .github/workflows/check_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ jobs:
check:
strategy:
matrix:
os: [windows-latest, windows-2019]
# FIXME: Enable legacy windows if required
# os: [windows-latest, windows-2019]
os: [windows-latest,]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -15,14 +17,27 @@ jobs:
- name: Install vcpkg
run: vcpkg integrate install

- name: Install Ninja
run: choco install ninja

# - name: Install Vulkan SDK
# uses: humbletim/install-vulkan-sdk@v1.1.1
# with:
# cache: true



- name: cargo check without default features
run: cargo check --no-default-features --features notan/shaderc

- name: clean
run: cargo clean

- name: Install libheif
run: vcpkg install libheif:x64-windows-static-md

- name: Install libheif static
run: vcpkg install libheif:x64-windows-static

- name: cargo check without default features
run: cargo check --no-default-features

- name: cargo check build features
run: cargo check --features heif
- name: cargo check build features & heif
run: cargo check --features heif --features notan/shaderc
39 changes: 21 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,22 @@ jobs:
- uses: actions/checkout@v2
- uses: ilammy/setup-nasm@v1

- name: Install latest rust
run: rustup update

- name: Install cargo cross
run: cargo install cross
if: matrix.os == 'ubuntu-latest'

- name: Cross-compile armv7
run: |
cross build --release --target armv7-unknown-linux-gnueabihf --no-default-features
cross build --release --target armv7-unknown-linux-gnueabihf --no-default-features --features notan/glsl-to-spirv
zip -r oculante_armv7_minimal.zip target/armv7-unknown-linux-gnueabihf/release/oculante
if: matrix.os == 'ubuntu-latest'

- name: Cross-compile arm64
run: |
cross build --release --target aarch64-unknown-linux-gnu --no-default-features
cross build --release --target aarch64-unknown-linux-gnu --no-default-features --features notan/glsl-to-spirv
zip -r oculante_aarch64_minimal.zip target/aarch64-unknown-linux-gnu/release/oculante
if: matrix.os == 'ubuntu-latest'

Expand Down Expand Up @@ -101,13 +104,13 @@ jobs:
if: matrix.os == 'windows-2019'

- name: Build Windows Application
run: cargo build --release --features heif
run: cargo build --release --features heif --features notan/glsl-to-spirv
if: matrix.os == 'windows-2019'


- name: Build Linux classic Application
run: |
cargo build --release --no-default-features
cargo build --release --no-default-features --features notan/glsl-to-spirv
zip -r oculante_linux_minimal.zip target/release/oculante
cargo build --release
zip -r oculante_linux.zip target/release/oculante
Expand Down Expand Up @@ -236,17 +239,17 @@ jobs:
with:
release_id: ${{ needs.release_job.outputs.release_id }}

aur-publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Publish AUR package
uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
with:
pkgname: oculante
pkgbuild: ./PKGBUILD
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
commit_message: Update oculante AUR package
ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
# aur-publish:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - name: Publish AUR package
# uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
# with:
# pkgname: oculante
# pkgbuild: ./PKGBUILD
# commit_username: ${{ secrets.AUR_USERNAME }}
# commit_email: ${{ secrets.AUR_EMAIL }}
# ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
# commit_message: Update oculante AUR package
# ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
92 changes: 92 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,95 @@
# 0.8.23 (2024-07-29)

### :beetle: Bug Fixes

* Display image path for loading errors (fixes #387) (9bc72095)
* Prevent panic for scrubber index being out of range and allow opening images without path prefic correctly (7a9a99c1)
* update index when image in same folder is loaded (fixes #377) (f2297402)
* Switching theme removes accent color (fixes #375) (e35dea4d)
* Preserve scubber index (d9146d08)
* Prevent image removal going out of bounds (fixes #379) (9b69076f)
* Clearing and deleting an image removes it from the virtual scrubber and advances to the next according to the scrubber direction (a0b7dc5a)
* Fix issue where SVG files were detected as XML (fixes #371) (d2ce9f17)
* Compare menu works without image loaded (46a8218f)
* ClearImage can be assigned to a shortcut (b9b00aca)
* extend BSD variants (f716dfc5)

### :sparkles: Features

* Allow configuring mipmaps and linear mag/min filters (58da0b26)
* Allow passing multiple images on the command line (0a2e918a)
* Enhance scrubber experience to provide a virtual file list. (e3c45a8e)
* Detect file types by content instead of extension. Warn if mismatch happens. (59138263)
* More love for compare mode ui, option to remove current image (68a5a483)
* Allow configuring the minimum window size (1787a14f)

### :green_apple: Chore

* **deps**: bump zerovec from 0.10.2 to 0.10.4 (4cf7959e)
* update resvg (be6a67f6)
* Update Notan and Egui (fc1fccef)
* update deps (031e83ce)

# 0.8.22 (2024-05-19)

### :beetle: Bug Fixes

* Ensure spirv is not used when only using shaderc (03f9167e)
* Allow loading huge webp images and handle still frames differently (e4ebc2dc)
* Set window min size to 100x100 to prevent super tiny window (fixes #325) (d63d971c)

### :sparkles: Features

* add icns image support (internal png data only, load largest contained image) (0703d220)

### :green_apple: Chore

* update avif-decode, evalexpr, exr, rfd, self_update, jxl-oxide, imageproc (a6c98436)
* Clean up warnings (ab2b03fe)

# 0.8.21 (2024-05-10)

### :green_apple: Chore

* Disable AUR publishing: This package has been moved to the official [extra] repository. (55245529)

# 0.8.20 (2024-05-10)

### :sparkles: Features

* Support EXR with single layers (non-rgba) (d22e78c4)

### :green_apple: Chore

* update deps and use new HDR support from `image` (bd7cbf89)

# 0.8.19 (2024-04-29)

### :beetle: Bug Fixes

* prevent zoom with keyboard (fixes #304) (2de35ed6)

### :sparkles: Features

* Map float TIFF images to min-max range (52f87f82)

### :green_apple: Chore

* Update logo (1783609d)
* update icon (716f6e9c)
* **deps**: bump rustls from 0.21.10 to 0.21.11 (f0c1743b)

# 0.8.18 (2024-04-06)

### :sparkles: Features

* APNG support (c633764d)

### :green_apple: Chore

* **deps**: bump h2 from 0.3.24 to 0.3.26 (59c559ac)
* update logo (6ae3bc03)

# 0.8.17 (2024-03-29)

### :beetle: Bug Fixes
Expand Down
Loading

0 comments on commit e255560

Please sign in to comment.