Skip to content

Commit

Permalink
Merge pull request #17 from cpyarger/master
Browse files Browse the repository at this point in the history
Add Tar.GZ file for Linux artifacts -- oops meant to merge this days ago
  • Loading branch information
cpyarger authored Jul 1, 2020
2 parents dca10ae + 85c682c commit 109e8c6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 24 deletions.
12 changes: 9 additions & 3 deletions CI/package-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ if [[ "$BRANCH_FULL_NAME" =~ "^refs/tags/" ]]; then
fi

cd ./build
ls -l
ls -l ..
mkdir -p obs-studio/plugins/64bit/
cp ./obs-midi.so obs-studio/plugins/64bit/
tar -czvf obs-midi-Linux-$GIT_HASH-x64.tar.gz obs-studio

PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \
--backup=no --deldoc=yes --install=no \
--pkgname=obs-midi --pkgversion="$PKG_VERSION" \
--pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \
--pkglicense="GPLv2.0" --maintainer="cpyarger@gmail.com" \
--pkggroup="video" \
--pkgsource="https://github.com/Palakis/obs-midi" \
--pkgsource="https://github.com/alzy/obs-midi" \
--requires="obs-studio \(\>= 25.0.7\), libqt5core5a, libqt5widgets5, qt5-image-formats-plugins" \
--pakdir="../package"

sudo chmod 777 ../package
cp obs-midi-Linux-$GIT_HASH-x64.tar.gz ../package/
sudo chmod ao+r ../package/*
23 changes: 2 additions & 21 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ trigger:
branches:
include:
- master
- sqlite
- releases
tags:
include:
- '*'
Expand Down Expand Up @@ -45,32 +47,26 @@ jobs:
steps:
- checkout: self
submodules: true

- script: ./CI/install-qt-win.cmd
displayName: 'Install Qt'
env:

QtBaseDir: $(QtBaseDir)

- task: Cache@2
displayName: Restore cached OBS Studio dependencies
inputs:
key: 'obsdeps | "$(Agent.OS)"'
restoreKeys: |
obsdeps | "$(Agent.OS)"
path: $(DepsBasePath)

- script: ./CI/download-obs-deps.cmd
displayName: 'Download OBS Studio dependencies'

- task: Cache@2
displayName: Restore cached OBS Studio builds
inputs:
key: 'obs | "$(Agent.OS)"'
restoreKeys: |
obs | "$(Agent.OS)"
path: $(OBSPath)

- script: ./CI/prepare-obs-windows.cmd
displayName: 'Checkout & CMake OBS Studio'
env:
Expand All @@ -81,19 +77,16 @@ jobs:
QTDIR64: $(QTDIR64)
OBSPath: $(OBSPath)
isAzure: $(isAzure)

- task: MSBuild@1
displayName: 'Build OBS Studio 32-bit'
inputs:
msbuildArguments: '/m /p:Configuration=$(build_config)'
solution: '$(OBSPath)\build32\obs-studio.sln'

- task: MSBuild@1
displayName: 'Build OBS Studio 64-bit'
inputs:
msbuildArguments: '/m /p:Configuration=$(build_config)'
solution: '$(OBSPath)\build64\obs-studio.sln'

- script: ./CI/prepare-windows.cmd
displayName: 'CMake obs-midi'
env:
Expand All @@ -102,13 +95,11 @@ jobs:
QTDIR64: $(QTDIR64)
OBSPath: $(OBSPath)
isAzure: $(isAzure)

- task: MSBuild@1
displayName: 'Build obs-midi 32-bit'
inputs:
msbuildArguments: '/m /p:Configuration=$(build_config)'
solution: '.\build32\obs-midi.sln'

- task: MSBuild@1
displayName: 'Build obs-midi 64-bit'
inputs:
Expand All @@ -117,7 +108,6 @@ jobs:

- script: ./CI/package-windows.cmd
displayName: 'Package obs-midi'

- task: PublishBuildArtifacts@1
displayName: 'Upload package artifacts'
inputs:
Expand All @@ -135,18 +125,14 @@ jobs:
steps:
- checkout: self
submodules: true

- script: ./CI/install-dependencies-ubuntu.sh
displayName: 'Install dependencies'

- script: ./CI/build-ubuntu.sh
displayName: 'Build obs-midi'
env:
isAzure: $(isAzure)

- script: ./CI/package-ubuntu.sh
displayName: 'Package obs-midi'

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: './package'
Expand All @@ -160,13 +146,10 @@ jobs:
steps:
- checkout: self
submodules: true

- script: ./CI/install-dependencies-macos.sh
displayName: 'Install dependencies'

- script: ./CI/install-build-obs-macos.sh
displayName: 'Build OBS'

- script: ./CI/build-macos.sh
displayName: 'Build obs-midi'
env:
Expand All @@ -175,8 +158,6 @@ jobs:
displayName: 'Package obs-midi'
env:
RELEASE_MODE: false


- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: './release'
Expand Down

0 comments on commit 109e8c6

Please sign in to comment.