Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Disable windows in publish-nym-vpn-core workflow (#1672)" #1675

Merged
merged 1 commit into from
Nov 28, 2024
+11 −12
Merged

Revert "Disable windows in publish-nym-vpn-core workflow (#1672)" #1675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions .github/workflows/publish-nym-vpn-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
UPLOAD_DIR_DEB: deb_artifacts
UPLOAD_DIR_ANDROID: android_artifacts
UPLOAD_DIR_IOS: ios_artifacts
# UPLOAD_DIR_WINDOWS: windows_artifacts
UPLOAD_DIR_WINDOWS: windows_artifacts
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
Expand All @@ -33,8 +33,8 @@ jobs:
uses: ./.github/workflows/build-nym-vpn-core-android.yml
build-nym-vpn-core-ios:
uses: ./.github/workflows/build-nym-vpn-core-ios.yml
# build-nym-vpn-core-windows:
# uses: ./.github/workflows/build-nym-vpn-core-windows.yml
build-nym-vpn-core-windows:
uses: ./.github/workflows/build-nym-vpn-core-windows.yml

generate-build-info-core:
uses: ./.github/workflows/generate-build-info-core.yml
Expand All @@ -50,7 +50,7 @@ jobs:
- build-nym-vpn-core-deb
- build-nym-vpn-core-android
- build-nym-vpn-core-ios
# - build-nym-vpn-core-windows
- build-nym-vpn-core-windows
- generate-build-info-core
runs-on: arc-ubuntu-22.04
permissions:
Expand Down Expand Up @@ -100,30 +100,30 @@ jobs:
ARCHIVE_MAC=nym-vpn-core-v${{ steps.workspace-version.outputs.metadata }}_macos_universal
ARCHIVE_ANDROID=nym-vpn-core-v${{ steps.workspace-version.outputs.metadata }}_android_aarch64
ARCHIVE_IOS=nym-vpn-core-v${{ steps.workspace-version.outputs.metadata }}_ios_universal
# ARCHIVE_WINDOWS=nym-vpn-core-v${{ steps.workspace-version.outputs.metadata }}_windows_x86_64
ARCHIVE_WINDOWS=nym-vpn-core-v${{ steps.workspace-version.outputs.metadata }}_windows_x86_64
echo "ARCHIVE_LINUX=${ARCHIVE_LINUX}" >> $GITHUB_ENV
echo "ARCHIVE_MAC=${ARCHIVE_MAC}" >> $GITHUB_ENV
echo "ARCHIVE_ANDROID=${ARCHIVE_ANDROID}" >> $GITHUB_ENV
echo "ARCHIVE_IOS=${ARCHIVE_IOS}" >> $GITHUB_ENV
# echo "ARCHIVE_WINDOWS=${ARCHIVE_WINDOWS}" >> $GITHUB_ENV
echo "ARCHIVE_WINDOWS=${ARCHIVE_WINDOWS}" >> $GITHUB_ENV

mv ${{ env.UPLOAD_DIR_LINUX }} ${ARCHIVE_LINUX}
mv ${{ env.UPLOAD_DIR_MAC }} ${ARCHIVE_MAC}
mv ${{ env.UPLOAD_DIR_ANDROID }} ${ARCHIVE_ANDROID}
mv ${{ env.UPLOAD_DIR_IOS }} ${ARCHIVE_IOS}
# mv ${{ env.UPLOAD_DIR_WINDOWS }} ${ARCHIVE_WINDOWS}
mv ${{ env.UPLOAD_DIR_WINDOWS }} ${ARCHIVE_WINDOWS}

tar cvzf ${ARCHIVE_LINUX}.tar.gz ${ARCHIVE_LINUX}
tar cvzf ${ARCHIVE_MAC}.tar.gz ${ARCHIVE_MAC}
tar cvzf ${ARCHIVE_ANDROID}.tar.gz ${ARCHIVE_ANDROID}
zip -r ${ARCHIVE_IOS}.zip ${ARCHIVE_IOS}
# zip -r ${ARCHIVE_WINDOWS}.zip ${ARCHIVE_WINDOWS}
zip -r ${ARCHIVE_WINDOWS}.zip ${ARCHIVE_WINDOWS}

sha256sum ${ARCHIVE_LINUX}.tar.gz > "${ARCHIVE_LINUX}.tar.gz.sha256sum"
sha256sum ${ARCHIVE_MAC}.tar.gz > "${ARCHIVE_MAC}.tar.gz.sha256sum"
sha256sum ${ARCHIVE_ANDROID}.tar.gz > "${ARCHIVE_ANDROID}.tar.gz.sha256sum"
sha256sum ${ARCHIVE_IOS}.zip > "${ARCHIVE_IOS}.zip.sha256sum"
# sha256sum ${ARCHIVE_WINDOWS}.zip > "${ARCHIVE_WINDOWS}.zip.sha256sum"
sha256sum ${ARCHIVE_WINDOWS}.zip > "${ARCHIVE_WINDOWS}.zip.sha256sum"

pushd ${{ env.UPLOAD_DIR_DEB }}
for deb in nym-vpn*_amd64.deb; do
Expand All @@ -136,7 +136,7 @@ jobs:
cat ${ARCHIVE_MAC}.tar.gz.sha256sum >> $GITHUB_ENV
cat ${ARCHIVE_ANDROID}.tar.gz.sha256sum >> $GITHUB_ENV
cat ${ARCHIVE_IOS}.zip.sha256sum >> $GITHUB_ENV
# cat ${ARCHIVE_WINDOWS}.zip.sha256sum >> $GITHUB_ENV
cat ${ARCHIVE_WINDOWS}.zip.sha256sum >> $GITHUB_ENV
pushd ${{ env.UPLOAD_DIR_DEB }}
for deb_sha256 in nym-vpn*_amd64.deb.sha256sum; do
cat ${deb_sha256} >> $GITHUB_ENV
Expand Down Expand Up @@ -176,10 +176,9 @@ jobs:
${{ env.ARCHIVE_MAC }}.tar.gz ${{ env.ARCHIVE_MAC }}.tar.gz.sha256sum \
${{ env.ARCHIVE_IOS }}.zip ${{ env.ARCHIVE_IOS }}.zip.sha256sum \
${{ env.ARCHIVE_ANDROID }}.tar.gz ${{ env.ARCHIVE_ANDROID }}.tar.gz.sha256sum \
${{ env.ARCHIVE_WINDOWS }}.zip ${{ env.ARCHIVE_WINDOWS }}.zip.sha256sum \
${{ env.UPLOAD_DIR_DEB}}/nym-vpn*_amd64.deb ${{ env.UPLOAD_DIR_DEB }}/nym-vpn*_amd64.deb.sha256sum

# ${{ env.ARCHIVE_WINDOWS }}.zip ${{ env.ARCHIVE_WINDOWS }}.zip.sha256sum \


gen-hashes:
uses: ./.github/workflows/gen-hashes-json.yml
Expand Down