Skip to content

Commit

Permalink
edit the correct file...
Browse files Browse the repository at this point in the history
  • Loading branch information
Simn committed Feb 3, 2024
1 parent c193f80 commit 30f3c02
Showing 1 changed file with 3 additions and 60 deletions.
63 changes: 3 additions & 60 deletions extra/github-actions/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,6 @@ jobs:
@import install-ocaml-libs-windows.yml
@import build-windows.yml

windows-build:
runs-on: windows-latest
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
PLATFORM: windows
ARCH: 32
MINGW_ARCH: i686
CYG_ROOT: D:\cygwin
steps:
- uses: actions/checkout@main
with:
submodules: recursive

- name: Use GNU Tar from msys
run: |
echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
rm C:\msys64\usr\bin\bash.exe
@import install-nsis.yml
@import install-neko-windows.yml
@import install-ocaml-windows.yml
@import install-ocaml-libs-windows.yml
@import build-windows.yml

linux-build:
runs-on: ubuntu-20.04
env:
Expand Down Expand Up @@ -375,33 +351,6 @@ jobs:
@import install-neko-windows.yml
@import test-windows.yml

windows-test:
needs: windows-build
runs-on: windows-latest
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
PLATFORM: windows
TEST: ${{matrix.target}}
HXCPP_COMPILE_CACHE: ~/hxcache
ARCH: 32
strategy:
fail-fast: false
matrix:
# TODO jvm: https://github.com/HaxeFoundation/haxe/issues/8601
# TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/10919
target: [macro, js, hl, cpp, java, cs, php, python, flash, neko]
steps:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v3
with:
name: win${{env.ARCH}}Binaries
path: win${{env.ARCH}}Binaries

@import install-neko-windows.yml
@import test-windows.yml

mac-test:
needs: mac-build
runs-on: macos-latest
Expand Down Expand Up @@ -431,7 +380,7 @@ jobs:

deploy:
if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
needs: [linux-test, linux-arm64, mac-test, windows64-test]
runs-on: ubuntu-20.04
steps:
# this is only needed for to get `COMMIT_DATE`...
Expand Down Expand Up @@ -474,9 +423,6 @@ jobs:
aws s3 cp win64Binaries/*_bin.zip ${HXBUILDS_S3ADDR}/haxe/windows64/${FILE_NAME}.zip
aws s3 cp win64Binaries/*_installer.zip ${HXBUILDS_S3ADDR}/haxe/windows64-installer/${FILE_NAME}.zip
aws s3 cp win64Binaries/*.nupkg ${HXBUILDS_S3ADDR}/haxe/windows64-choco/
aws s3 cp win32Binaries/*_bin.zip ${HXBUILDS_S3ADDR}/haxe/windows/${FILE_NAME}.zip
aws s3 cp win32Binaries/*_installer.zip ${HXBUILDS_S3ADDR}/haxe/windows-installer/${FILE_NAME}.zip
aws s3 cp win32Binaries/*.nupkg ${HXBUILDS_S3ADDR}/haxe/windows-choco/
- name: Update "latest"
if: github.ref == 'refs/heads/development'
Expand All @@ -494,20 +440,17 @@ jobs:
aws s3 cp macBinaries/*_installer.tar.gz ${HXBUILDS_S3ADDR}/haxe/mac-installer/haxe_latest.tar.gz
aws s3 cp win64Binaries/*_bin.zip ${HXBUILDS_S3ADDR}/haxe/windows64/haxe_latest.zip
aws s3 cp win64Binaries/*_installer.zip ${HXBUILDS_S3ADDR}/haxe/windows64-installer/haxe_latest.zip
aws s3 cp win32Binaries/*_bin.zip ${HXBUILDS_S3ADDR}/haxe/windows/haxe_latest.zip
aws s3 cp win32Binaries/*_installer.zip ${HXBUILDS_S3ADDR}/haxe/windows-installer/haxe_latest.zip
# Chocolatey packages have to be named with version number,
# so let's use web redirection to keep the original file name.
[[ "$HXBUILDS_S3ADDR" =~ s3://([^/]+)(.*) ]] && HXBUILDS_S3BUCKET="${BASH_REMATCH[1]}" && HXBUILDS_S3PATH="${BASH_REMATCH[2]}"
[[ `echo win64Binaries/*.nupkg` =~ win64Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
aws s3 cp ${HXBUILDS_S3ADDR}/haxe/windows64-choco/${FILE_NAME} ${HXBUILDS_S3ADDR}/haxe/windows64-choco/haxe_latest.nupkg --acl public-read --website-redirect "${HXBUILDS_S3PATH}/haxe/windows64-choco/${FILE_NAME}"
[[ `echo win32Binaries/*.nupkg` =~ win32Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
aws s3 cp ${HXBUILDS_S3ADDR}/haxe/windows-choco/${FILE_NAME} ${HXBUILDS_S3ADDR}/haxe/windows-choco/haxe_latest.nupkg --acl public-read --website-redirect "${HXBUILDS_S3PATH}/haxe/windows-choco/${FILE_NAME}"
deploy_apidoc:
if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
needs: [linux-test, linux-arm64, mac-test, windows64-test]
runs-on: ubuntu-20.04
steps:
- name: Install dependencies
Expand Down

0 comments on commit 30f3c02

Please sign in to comment.