Skip to content

Commit

Permalink
Merge pull request #85 from rive-app/84
Browse files Browse the repository at this point in the history
84
  • Loading branch information
mjtalbot authored Jun 28, 2021
2 parents 8443822 + 4047122 commit 378d678
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 4 deletions.
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions .github/scripts/rive_cpp_check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
set -e

# GET hash of CPP MASTER.
RIVE_CPP_MASTER_HASH=$(git ls-remote https://github.com/rive-app/rive-cpp.git refs/heads/master | awk '{print $1}')
echo rive-cpp master is at $RIVE_CPP_MASTER_HASH


# GET hash of Submodule.
RIVE_IOS_CPP_SUBMODULE_HASH=$(git submodule | grep rive-cpp |awk '{print $1}' | sed -En 's/-*(.*)/\1/p')

echo rive-ios cpp submodule is at $RIVE_IOS_CPP_SUBMODULE_HASH

if [ "$RIVE_CPP_MASTER_HASH" == "$RIVE_IOS_CPP_SUBMODULE_HASH" ]
then
echo "They match. all is good"
else
# Just full on assuming this is behind for the time being.
# Could put in some 'useful' links into this message. Once we have something useful to do (other than update & rebuild)
curl -X POST -H 'Content-type: application/json' --data '{"text":"`rive-ios` is behind rive-cpp!"}' $SLACK_WEBHOOK
fi
File renamed without changes.
6 changes: 3 additions & 3 deletions .github/workflows/build_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
run: git submodule update --init
- id: build_iphoneos
name: Build release iphoneos framework
run: sh ./scripts/buildFramework.sh -t iphoneos -c Release
run: sh ./.github/scripts/buildFramework.sh -t iphoneos -c Release
- id: build_iphonesimulator
name: Build release iphonesimulator framework
run: sh ./scripts/buildFramework.sh -t iphonesimulator -c Release
run: sh ./.github/scripts/buildFramework.sh -t iphonesimulator -c Release
- id: merge_frameworks
if: steps.build_iphoneos.conclusion == 'success' && steps.build_iphonesimulator.conclusion == 'success'
name: Merge created frameworks
run: sh ./scripts/mergeFrameworks.sh -c Release
run: sh ./.github/scripts/mergeFrameworks.sh -c Release
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/submodule_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Check rive-ios sub modules

on:
# lets check it when we push to master (we've just done something in android, its a good time to see about this)
push:
branches:
- master

schedule:
# 8am UTC every day
- cron: '0 8 * * *'


jobs:
build:
runs-on: macos-latest
steps:
- name: Checkout Code
uses: actions/checkout@v2

- name: Run cpp version check
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
run: sh ./.github/scripts/rive_cpp_check.sh
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
token: ${{ secrets.RIVE_REPO_PAT }}
submodules: recursive
- name: Testing iOS app
run: sh ./scripts/test.sh
run: sh ./.github/scripts/test.sh

0 comments on commit 378d678

Please sign in to comment.