Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jingjingxyk committed Jan 1, 2025
2 parents 2fa2b3e + 03ff24f commit 23b4d2e
Show file tree
Hide file tree
Showing 100 changed files with 284 additions and 3,849 deletions.
46 changes: 0 additions & 46 deletions .github/workflows/artifact-hash.yml

This file was deleted.

117 changes: 0 additions & 117 deletions .github/workflows/auto-cache-pool-tarball.yml

This file was deleted.

86 changes: 0 additions & 86 deletions .github/workflows/build-debian-builder-container.sh

This file was deleted.

8 changes: 0 additions & 8 deletions .github/workflows/linux-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,6 @@ jobs:
bash make.sh build
bash make.sh archive
- name: Start Database
run: |
# 准备数据库容器
export PATH=/usr/libexec/docker/cli-plugins/:$PATH
docker-compose version
docker container ls -a
# bash sapi/src/UnitTest/scripts/database/start.sh
- name: Show Build Result
run: |
./bin/socat -V
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/macos-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,3 @@ jobs:
if: 1 && startsWith(github.ref, 'refs/tags/')
with:
files: socat-v${{ env.SOCAT_VERSION }}-macos-arm64.tar.xz

1 change: 1 addition & 0 deletions .github/workflows/macos-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,4 @@ jobs:
if: 1 && startsWith(github.ref, 'refs/tags/')
with:
files: socat-v${{ env.SOCAT_VERSION }}-macos-x64.tar.xz

4 changes: 0 additions & 4 deletions .github/workflows/runner-images.md

This file was deleted.

22 changes: 18 additions & 4 deletions .github/workflows/windows-cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
systeminfo
systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
systeminfo | findstr /B /C:"Manufacturer" /C:"Product" /C:"Version"
env
set
ipconfig
uname -a
pwd
Expand Down Expand Up @@ -62,25 +62,40 @@ jobs:
# platform: x64
# packages: make wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel liblz4-devel liblzma-devel libzip-devel libicu-devel libonig-devel libcares-devel libsodium-devel libyaml-devel libMagick-devel libzstd-devel libbrotli-devel libreadline-devel libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils openssl-devel zip unzip

- name: Install Cygwin Packages
- name: Install Cygwin Packages with bash
if: 0
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
ls -lah /cygdrive/c/
ls -lah /cygdrive/d/
cp -f /cygdrive/c/setup.exe /cygdrive/c/cygwin/bin/setup-x86_64.exe
bash ./sapi/scripts/cygwin/install-cygwin.sh
- name: Prepare
- name: Install Cygwin Packages
if: 1
run: |
Copy-Item -Path "C:\setup.exe" -Destination "${{ github.workspace }}\setup-x86_64.exe"
cmd /c .\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
- name: Install re2c
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
bash ./sapi/scripts/cygwin/install-re2c.sh
- name: Configure
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
# git config --global --add safe.directory /cygdrive/d/a/swoole-cli/swoole-cli
# git submodule update --init
bash ./sapi/scripts/cygwin/cygwin-config-ext.sh --php-version ${{ env.BUILD_PHP_VERSION }}
- name: Configure
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
bash ./sapi/scripts/cygwin/cygwin-config.sh --php-version ${{ env.BUILD_PHP_VERSION }}
- name: Build
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
run: |
bash ./sapi/scripts/cygwin/cygwin-build.sh
Expand Down Expand Up @@ -113,4 +128,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: socat-v${{ env.APP_VERSION }}-cygwin-x64.zip

Loading

0 comments on commit 23b4d2e

Please sign in to comment.