Skip to content

Commit

Permalink
Remove hotfix patching since changes are merged
Browse files Browse the repository at this point in the history
  • Loading branch information
notmarek committed Oct 31, 2023
1 parent 9977626 commit 6232483
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/master-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
- name: Extract Hotfix
run: sh ./utils/extractHotfix.sh
- run: mkdir newHotfix
- name: Move patched uks to new hotfix
run: cp patchedUks.sqsh newHotfix
- name: Patching bridge and bridge install
run: patch originalHotfix/bridge < utils/bridge.patch
- run: patch originalHotfix/install-bridge.sh < utils/install-bridge.sh.patch
# - name: Move patched uks to new hotfix
# run: cp patchedUks.sqsh newHotfix
# - name: Patching bridge and bridge install # no need to patch anymore yay
# run: patch originalHotfix/bridge < utils/bridge.patch
# - run: patch originalHotfix/install-bridge.sh < utils/install-bridge.sh.patch
- run: mv originalHotfix/* newHotfix
- run: mkdir build
- name: "Building hotix universally"
Expand Down
10 changes: 5 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ echo "extracting hotfix"
./utils/extractHotfix.sh &> /dev/null
rm -rf newHotfix
mkdir newHotfix
echo "moving patched uks to the new hotfix"
cp patchedUks.sqsh newHotfix
echo "patching bridge in the new hotfix"
$(patch originalHotfix/bridge < utils/bridge.patch) &> /dev/null
$(patch originalHotfix/install-bridge.sh < utils/install-bridge.sh.patch) &> /dev/null
# echo "moving patched uks to the new hotfix"
# cp patchedUks.sqsh newHotfix
# echo "patching bridge in the new hotfix" # we don't need to patch it anymore
# $(patch originalHotfix/bridge < utils/bridge.patch) &> /dev/null
# $(patch originalHotfix/install-bridge.sh < utils/install-bridge.sh.patch) &> /dev/null
mv originalHotfix/* newHotfix
mkdir build
rm -rf originalHotfix
Expand Down

0 comments on commit 6232483

Please sign in to comment.