2
0
Rudy Ges 5 сар өмнө
parent
commit
6bcd657cea

+ 1 - 385
.github/workflows/main.yml

@@ -227,173 +227,6 @@ jobs:
           name: xmldoc
           name: xmldoc
           path: extra/doc
           path: extra/doc
 
 
-  linux-test:
-    needs: linux-build
-    runs-on: ubuntu-20.04
-    env:
-      PLATFORM: linux64
-      TEST: ${{matrix.target}}
-      HXCPP_COMPILE_CACHE: ~/hxcache
-      HAXE_STD_PATH: /usr/local/share/haxe/std
-    strategy:
-      fail-fast: false
-      matrix:
-        ocaml: ["4.08.1", "5.0.0"]
-        target: [macro, js, hl, cpp, jvm, php, python, lua, flash, neko]
-        include:
-          - target: hl
-            APT_PACKAGES: cmake ninja-build libturbojpeg-dev
-          - target: cpp
-            APT_PACKAGES: gcc-multilib g++-multilib
-          - target: lua
-            APT_PACKAGES: ncurses-dev
-          - target: flash
-            APT_PACKAGES: libglib2.0-0 libgtk2.0-0 libfreetype6 xvfb
-    steps:
-      - uses: actions/checkout@main
-        with:
-          submodules: recursive
-      - uses: actions/download-artifact@v4
-        with:
-          name: linuxBinaries${{ (matrix.ocaml == '5.0.0' && '_ocaml5') || '' }}
-          path: linuxBinaries
-
-      - name: Install Neko from S3
-        run: |
-          set -ex
-
-          curl -sSL https://build.haxe.org/builds/neko/$PLATFORM/neko_latest.tar.gz -o $RUNNER_TEMP/neko_latest.tar.gz
-          tar -xf $RUNNER_TEMP/neko_latest.tar.gz -C $RUNNER_TEMP
-          NEKOPATH=`echo $RUNNER_TEMP/neko-*-*`
-          sudo mkdir -p /usr/local/bin
-          sudo mkdir -p /usr/local/include
-          sudo mkdir -p /usr/local/lib/neko
-          sudo ln -s $NEKOPATH/{neko,nekoc,nekoml,nekotools}  /usr/local/bin/
-          sudo ln -s $NEKOPATH/libneko.*                      /usr/local/lib/
-          sudo ln -s $NEKOPATH/include/*                      /usr/local/include/
-          sudo ln -s $NEKOPATH/*.ndll                         /usr/local/lib/neko/
-          echo "NEKOPATH=$NEKOPATH" >> $GITHUB_ENV
-
-      - name: Print Neko version
-        run: neko -version 2>&1
-
-
-      - name: Setup Haxe
-        run: |
-          sudo apt install -qqy libmbedtls-dev
-
-          set -ex
-          tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
-          sudo mkdir -p /usr/local/bin/
-          sudo mkdir -p /usr/local/share/haxe/
-          sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
-          sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
-          sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
-
-      - name: Print Haxe version
-        run: haxe -version
-
-      - name: Setup haxelib
-        run: |
-          set -ex
-          mkdir ~/haxelib
-          haxelib setup ~/haxelib
-
-      - name: Install apt packages
-        if: matrix.APT_PACKAGES
-        run: |
-          set -ex
-          sudo apt update -qqy
-          sudo apt install -qqy ${{matrix.APT_PACKAGES}}
-
-      - name: Flash setup
-        if: matrix.target == 'flash'
-        run: export DISPLAY=:99.0
-
-      - name: Test
-        run: haxe RunCi.hxml
-        working-directory: ${{github.workspace}}/tests
-
-  test-docgen:
-    needs: linux-build
-    runs-on: ubuntu-20.04
-    env:
-      PLATFORM: linux64
-      HXCPP_COMPILE_CACHE: ~/hxcache
-    steps:
-      - uses: actions/checkout@main
-        with:
-          submodules: recursive
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: linuxBinaries
-          path: linuxBinaries
-
-      - name: Download xmldoc artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: xmldoc
-          path: xmldoc
-
-      - name: Install Neko from S3
-        run: |
-          set -ex
-
-          curl -sSL https://build.haxe.org/builds/neko/$PLATFORM/neko_latest.tar.gz -o $RUNNER_TEMP/neko_latest.tar.gz
-          tar -xf $RUNNER_TEMP/neko_latest.tar.gz -C $RUNNER_TEMP
-          NEKOPATH=`echo $RUNNER_TEMP/neko-*-*`
-          sudo mkdir -p /usr/local/bin
-          sudo mkdir -p /usr/local/include
-          sudo mkdir -p /usr/local/lib/neko
-          sudo ln -s $NEKOPATH/{neko,nekoc,nekoml,nekotools}  /usr/local/bin/
-          sudo ln -s $NEKOPATH/libneko.*                      /usr/local/lib/
-          sudo ln -s $NEKOPATH/include/*                      /usr/local/include/
-          sudo ln -s $NEKOPATH/*.ndll                         /usr/local/lib/neko/
-          echo "NEKOPATH=$NEKOPATH" >> $GITHUB_ENV
-
-      - name: Print Neko version
-        run: neko -version 2>&1
-
-
-      - name: Setup Haxe
-        run: |
-          sudo apt install -qqy libmbedtls-dev
-
-          set -ex
-          tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
-          sudo mkdir -p /usr/local/bin/
-          sudo mkdir -p /usr/local/share/haxe/
-          sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
-          sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
-          sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
-
-      - name: Print Haxe version
-        run: haxe -version
-
-      - name: Setup haxelib
-        run: |
-          set -ex
-          mkdir ~/haxelib
-          haxelib setup ~/haxelib
-
-      - name: Test documentation generation
-        run: |
-          set -ex
-          haxelib git dox https://github.com/HaxeFoundation/dox.git
-          haxelib git hxtemplo https://github.com/Simn/hxtemplo.git
-          haxelib git hxargs https://github.com/Simn/hxargs.git
-          haxelib git markdown https://github.com/dpeek/haxe-markdown.git
-          haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git
-          cd $(haxelib libpath hxcpp)/tools/hxcpp
-          haxe compile.hxml
-          cd -
-          haxe dox.hxml
-          mkdir resources
-          cp ../../src-json/* resources
-          cpp/Dox -i ../../xmldoc -ex microsoft -ex javax -theme $(haxelib libpath dox)/themes/default
-        working-directory: ${{github.workspace}}/tests/docgen
-
   linux-arm64:
   linux-arm64:
     runs-on: ubuntu-20.04
     runs-on: ubuntu-20.04
     permissions:
     permissions:
@@ -562,103 +395,6 @@ jobs:
           name: macArmBinaries
           name: macArmBinaries
           path: out
           path: out
 
 
-
-  windows64-test:
-    needs: windows64-build
-    runs-on: windows-latest
-    env:
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-      PLATFORM: windows64
-      TEST: ${{matrix.target}}
-      HXCPP_COMPILE_CACHE: ~/hxcache
-      ARCH: 64
-    strategy:
-      fail-fast: false
-      matrix:
-        # TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/10919
-        target: [macro, js, hl, cpp, jvm, php, python, flash, neko]
-    steps:
-      - uses: actions/checkout@main
-        with:
-          submodules: recursive
-      - uses: actions/download-artifact@v4
-        with:
-          name: win${{env.ARCH}}Binaries
-          path: win${{env.ARCH}}Binaries
-
-      - name: Install Neko from S3
-        shell: pwsh
-        run: |
-          Invoke-WebRequest https://build.haxe.org/builds/neko/$env:PLATFORM/neko_latest.zip -OutFile $env:RUNNER_TEMP/neko_latest.zip
-          Expand-Archive $env:RUNNER_TEMP/neko_latest.zip -DestinationPath $env:RUNNER_TEMP
-          $NEKOPATH = Get-ChildItem $env:RUNNER_TEMP/neko-*-*
-          echo "$NEKOPATH" >> $env:GITHUB_PATH
-          echo "NEKOPATH=$NEKOPATH" >> $env:GITHUB_ENV
-
-      - name: Print Neko version
-        run: neko -version 2>&1
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18.17.1
-
-      # - name: Quick test
-      #   shell: pwsh
-      #   run: |
-      #     $DOWNLOADDIR="./win$($env:ARCH)Binaries"
-      #     new-item -Name $DOWNLOADDIR -ItemType directory
-      #     Invoke-WebRequest https://build.haxe.org/builds/haxe/$env:PLATFORM/haxe_latest.zip -OutFile $DOWNLOADDIR/haxe_bin.zip
-
-      - name: Setup Haxe
-        shell: pwsh
-        run: |
-          $DOWNLOADDIR="./win$($env:ARCH)Binaries"
-          Expand-Archive $DOWNLOADDIR/*_bin.zip -DestinationPath $DOWNLOADDIR
-          Set-PSDebug -Trace 1
-          $HAXEPATH = Get-ChildItem $DOWNLOADDIR/haxe_*_* -Directory
-          Write-Host "::add-path::$HAXEPATH"
-          Write-Host "::set-env name=HAXELIB_ROOT::$HAXEPATH\lib"
-
-      - name: Print Haxe version
-        shell: pwsh
-        run: haxe -version
-
-      - name: "Make Python 3 be available as python3 in the cmdline"
-        shell: pwsh
-        run: |
-          Set-PSDebug -Trace 1
-          $pypath = python -c "import sys; print(sys.executable)"
-          $py3path = $pypath.replace("python.exe","python3.exe")
-          cmd /c mklink $py3path $pypath
-          python3 -V
-
-      - name: Install hererocks
-        if: matrix.target == 'lua'
-        shell: cmd
-        run: |
-          pip install hererocks
-          hererocks lua53 -l5.3 -rlatest
-          call lua53/bin/activate
-
-      - name: Install wget
-        if: matrix.target == 'flash'
-        shell: cmd
-        run: |
-          choco install wget
-          wget --version
-
-      - name: Setup haxelib
-        shell: pwsh
-        run: |
-          mkdir "$env:HAXELIB_ROOT"
-          haxelib setup "$env:HAXELIB_ROOT"
-
-      - name: Test
-        shell: pwsh
-        run: haxe RunCi.hxml
-        working-directory: ${{github.workspace}}/tests
-
-
   mac-build-universal:
   mac-build-universal:
     needs: mac-build
     needs: mac-build
     runs-on: macos-latest
     runs-on: macos-latest
@@ -692,86 +428,9 @@ jobs:
           name: macBinaries
           name: macBinaries
           path: out
           path: out
 
 
-  mac-test:
-    needs: mac-build-universal
-    runs-on: macos-13
-    env:
-      PLATFORM: mac
-      TEST: ${{matrix.target}}
-      HXCPP_COMPILE_CACHE: ~/hxcache
-      HAXE_STD_PATH: /usr/local/share/haxe/std
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [macro, js, hl, cpp, jvm, php, python, lua, flash, neko]
-        include:
-          - target: hl
-            BREW_PACKAGES: ninja
-    steps:
-      - uses: actions/checkout@main
-        with:
-          submodules: recursive
-      - uses: actions/download-artifact@v4
-        with:
-          name: macBinaries
-          path: macBinaries
-
-      - name: Install Neko from S3
-        run: |
-          set -ex
-
-          curl -sSL https://build.haxe.org/builds/neko/$PLATFORM/neko_latest.tar.gz -o $RUNNER_TEMP/neko_latest.tar.gz
-          tar -xf $RUNNER_TEMP/neko_latest.tar.gz -C $RUNNER_TEMP
-          NEKOPATH=`echo $RUNNER_TEMP/neko-*-*`
-          sudo mkdir -p /usr/local/bin
-          sudo mkdir -p /usr/local/include
-          sudo mkdir -p /usr/local/lib/neko
-          sudo ln -s $NEKOPATH/{neko,nekoc,nekoml,nekotools}  /usr/local/bin/
-          sudo ln -s $NEKOPATH/libneko.*                      /usr/local/lib/
-          sudo ln -s $NEKOPATH/include/*                      /usr/local/include/
-          sudo ln -s $NEKOPATH/*.ndll                         /usr/local/lib/neko/
-          echo "NEKOPATH=$NEKOPATH" >> $GITHUB_ENV
-
-      - name: Print Neko version
-        run: neko -version 2>&1
-
-      - name: Setup Haxe
-        run: |
-          # mkdir ./macBinaries
-          # curl -sSL https://build.haxe.org/builds/haxe/mac/haxe_latest.tar.gz -o ./macBinaries/haxe_bin.tar.gz
-
-          set -ex
-          tar -xf macBinaries/*_bin.tar.gz -C macBinaries --strip-components=1
-          sudo mkdir -p /usr/local/bin/
-          sudo mkdir -p /usr/local/share/haxe/
-          sudo ln -s `pwd`/macBinaries/haxe /usr/local/bin/haxe
-          sudo ln -s `pwd`/macBinaries/haxelib /usr/local/bin/haxelib
-          sudo ln -s `pwd`/macBinaries/std /usr/local/share/haxe/std
-
-      - name: Print Haxe version
-        run: haxe -version
-
-      - name: Setup haxelib
-        run: |
-          set -ex
-          mkdir ~/haxelib
-          haxelib setup ~/haxelib
-
-      - name: Install homebrew packages
-        if: matrix.BREW_PACKAGES
-        run: brew install ${{matrix.BREW_PACKAGES}}
-
-      - name: Test
-        run: |
-          # disable invalid Unicode filenames on APFS
-          echo "" > sys/compile-fs.hxml
-          haxe RunCi.hxml
-        working-directory: ${{github.workspace}}/tests
-
-
   deploy:
   deploy:
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
-    needs: [linux-test, linux-arm64, mac-test, windows64-test]
+    needs: [linux-build, linux-arm64, mac-build-universal, windows64-build]
     runs-on: ubuntu-20.04
     runs-on: ubuntu-20.04
     steps:
     steps:
       # this is only needed for to get `COMMIT_DATE`...
       # this is only needed for to get `COMMIT_DATE`...
@@ -838,46 +497,3 @@ jobs:
           [[ `echo win64Binaries/*.nupkg` =~ win64Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
           [[ `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}"
           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}"
 
 
-
-  deploy_apidoc:
-    if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
-    needs: [linux-test, linux-arm64, mac-test, windows64-test]
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Install dependencies
-        run: |
-          set -ex
-          sudo apt-get install -qqy libc6
-
-      - name: Download Haxe
-        uses: actions/download-artifact@v4
-        with:
-          name: linuxBinaries
-          path: linuxBinaries
-
-      - name: Setup Haxe
-        run: |
-          set -ex
-          tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
-          sudo mkdir -p /usr/local/bin/
-          sudo mkdir -p /usr/local/share/haxe/
-          sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
-          sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
-          sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
-
-      - name: Download xmldoc artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: xmldoc
-          path: xmldoc
-
-      - name: Deploy to api.haxe.org
-        env:
-          GHP_EMAIL: [email protected]
-          GHP_USERNAME: Haxe CI Bot
-          GHP_REMOTE: ${{ secrets.GHP_REMOTE }}
-        run: |
-          set -ex
-          LOCAL="`pwd`/extra/api.haxe.org"
-          git clone "${GHP_REMOTE}" "${LOCAL}"
-          haxe --cwd "${LOCAL}" --run ImportXml "`pwd`/xmldoc"