Skip to content

Commit

Permalink
git subrepo pull (merge) lib/dfdutils
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "lib/dfdutils"
  merged:   "64ad915b"
upstream:
  origin:   "https://github.com/KhronosGroup/dfdutils.git"
  branch:   "master"
  commit:   "54f7520b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/MarkCallow/git-subrepo.git"
  commit:   "c1f1132"
  • Loading branch information
MarkCallow committed Apr 23, 2022
1 parent 045d5c1 commit c5abc16
Show file tree
Hide file tree
Showing 3 changed files with 487 additions and 251 deletions.
4 changes: 2 additions & 2 deletions lib/dfdutils/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/KhronosGroup/dfdutils.git
branch = master
commit = e742e8e2f5f65164daef25e7193a6a78c8805836
parent = ef925c9af1c32e79d2eb7d90745358977355ebfc
commit = 54f7520bdf8bae87f5703ea11c3e37faa1d990a0
parent = 045d5c1d4239af562b55cc82b3bab95643062607
method = merge
cmdver = 0.4.3
20 changes: 4 additions & 16 deletions lib/dfdutils/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,23 @@
# CI build script for Travis.
# See https://docs.travis-ci.com/user/multi-os/ for more info.

branches:
except:
- ktxsw

language: cpp

matrix:
include:
# works on Focal
- os: linux
addons:
apt:
sources:
- sourceline: 'ppa:ubuntu-toolchain-r/test'
packages:
- gcc-7
- g++-7
dist: focal
env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- VULKAN_SDK_VER="1.1.85"
- VULKAN_SDK_VER="1.2.176"
compiler: gcc # clang is tested by macOS build
- os: osx
env:
- VULKAN_SDK_VER="1.1.85.0"
- VULKAN_SDK_VER="1.2.176.1"
- VULKAN_INSTALL_DIR="$HOME/build/vulkansdk-macos-$VULKAN_SDK_VER"
- VULKAN_SDK="$VULKAN_INSTALL_DIR/macOS"
compiler: clang
osx_image: xcode11.4
osx_image: xcode13.2

#env:
#global:
Expand Down Expand Up @@ -77,7 +65,7 @@ script:

deploy:
provider: pages
cleanup: false
edge: true # Use bleeding edge (dplv2)
github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable
local-dir: out/doc/html
on:
Expand Down
Loading

0 comments on commit c5abc16

Please sign in to comment.