Skip to content

Commit

Permalink
Merge branch 'master' of github.com:woelper/oculante
Browse files Browse the repository at this point in the history
  • Loading branch information
woelper committed Jan 29, 2024
2 parents 7233539 + 8ce56fa commit e52c820
Show file tree
Hide file tree
Showing 24 changed files with 687 additions and 588 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check_netbsd_default_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on: [push]

jobs:
test:
runs-on: macos-12
runs-on: ubuntu-latest
name: Build in NetBSD with default features
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build in NetBSD
id: testnet
uses: vmactions/netbsd-vm@v0
uses: vmactions/netbsd-vm@v1
with:
mem: 4096
usesh: true
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/check_netbsd_minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,19 @@ on: [push]

jobs:
test:
runs-on: macos-12
runs-on: ubuntu-latest
name: Test in NetBSD
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Test in NetBSD
id: test
uses: vmactions/netbsd-vm@v0
uses: vmactions/netbsd-vm@v1.0.5
with:
mem: 4096
usesh: true
copyback: false
prepare: |
pkg_add curl pkg-config cmake openssl libX11 fontconfig freetype2 gdk-pixbuf2 cairo pango atk glib2 libXrender libxcb nasm perl
# gtk3 and libX11 seem to be missing ^^
# PKG_PATH="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f '1 2' -d.)/All/"
# export PKG_PATH
# pkg_add pkgin
# pkgin search gtk3
curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
/usr/sbin/pkg_add curl pkg-config cmake openssl libX11 fontconfig freetype2 gdk-pixbuf2 cairo pango atk glib2 libXrender libxcb nasm perl
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
run: |
PATH=$HOME/.cargo/bin:$PATH
export PATH
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.8.7 (2024-01-27)

### :sparkles: Features

* Basik support for ktx2 (6a41adda)

# 0.8.6 (2023-12-17)

### :beetle: Bug Fixes
Expand Down
Loading

0 comments on commit e52c820

Please sign in to comment.