Skip to content

Commit

Permalink
Merge branch 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
0xConsumer committed Jan 18, 2024
2 parents d63eb58 + 23608cd commit 7a3b130
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 86 deletions.
17 changes: 5 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
- '**.md'
- 'docs/**'
- '.github/**'
- 'Package.swift'
- '!.github/workflows/release.yml'

jobs:
Expand Down Expand Up @@ -73,21 +72,15 @@ jobs:
- name: zip
run: |
tree
rm -f ./bin/*.h
rm ./bin/hiddify-libcore*sources* ||echo "no source"
rm ./bin/hiddify-libcore-macos-a*.dylib || echo "no macos arm and amd"
rm -f /*.h
rm ./hiddify-libcore*sources* ||echo "no source"
rm ./hiddify-libcore-macos-a*.dylib || echo "no macos arm and amd"
if [[ "${{ matrix.job.target }}" == "ios" ]];then
cd bin
zip -r hiddify-libcore-ios.xcframework.zip hiddify-libcore-ios.xcframework
tar -czvf hiddify-libcore-ios.xcframework.tar.gz hiddify-libcore-ios.xcframework
rm -rf hiddify-libcore-ios.xcframework
else
gzip -r -S ".gz" ./bin/hiddify-libcore*
gzip -r -S ".gz" ./hiddify-libcore*
fi
- name: Calculate SHA256 Checksum
if: startsWith(matrix.job.target,'ios')
run: |
sha256sum hiddify-libcore-ios.xcframework.zip | awk '{print $1}'> hiddify-libcore-ios.xcframework.zip.sha256
working-directory: bin
- uses: actions/upload-artifact@v3
if: ${{ success() }}
Expand Down
7 changes: 0 additions & 7 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

This file was deleted.

Binary file not shown.

This file was deleted.

5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,11 @@ release: # Create a new tag for release.
VERSION_STR="$${VERSION_ARRAY[0]}.$${VERSION_ARRAY[1]}.$${VERSION_ARRAY[2]}" && \
BUILD_NUMBER=$$(( $${VERSION_ARRAY[0]} * 10000 + $${VERSION_ARRAY[1]} * 100 + $${VERSION_ARRAY[2]} )) && \
echo "version: $${VERSION_STR}+$${BUILD_NUMBER}" && \
# sed -i "s/^s.version: .*/s.version = '$${VERSION_STR}'/g" Libcore.podspec && \
sed -i "s/^let version: .*/let version = \"v$${VERSION_STR}\"/g" Package.swift && \

sed -i -e "s|<key>CFBundleVersion</key>\s*<string>[^<]*</string>|<key>CFBundleVersion</key><string>$${VERSION_STR}</string>|" Info.plist &&\
sed -i -e "s|<key>CFBundleShortVersionString</key>\s*<string>[^<]*</string>|<key>CFBundleShortVersionString</key><string>$${VERSION_STR}</string>|" Info.plist &&\
git tag $${TAG} > /dev/null && \
git tag -d $${TAG} > /dev/null && \
git add Package.swift Info.plist && \
git add Info.plist && \
git commit -m "release: version $${TAG}" && \
echo "creating git tag : v$${TAG}" && \
git tag v$${TAG} && \
Expand Down
31 changes: 0 additions & 31 deletions Package.swift

This file was deleted.

0 comments on commit 7a3b130

Please sign in to comment.