Skip to content

Commit

Permalink
[ci] update CI from development
Browse files Browse the repository at this point in the history
  • Loading branch information
kLabz committed Aug 31, 2023
1 parent 6c18eb8 commit cbfaa5f
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 42 deletions.
49 changes: 27 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
rm C:\msys64\usr\bin\bash.exe
- name: choco install nsis
uses: nick-invision/retry@v1
uses: nick-invision/retry@v2
with:
timeout_minutes: 10
max_attempts: 10
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
[ $(ls -1 out | wc -l) -eq "3" ]
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: win${{env.ARCH}}Binaries
path: out
Expand All @@ -139,7 +139,7 @@ jobs:
rm C:\msys64\usr\bin\bash.exe
- name: choco install nsis
uses: nick-invision/retry@v1
uses: nick-invision/retry@v2
with:
timeout_minutes: 10
max_attempts: 10
Expand Down Expand Up @@ -248,7 +248,7 @@ jobs:
[ $(ls -1 out | wc -l) -eq "3" ]
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: win${{env.ARCH}}Binaries
path: out
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
- name: Extract branch name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT

- name: Build xmldoc
run: |
Expand All @@ -341,13 +341,13 @@ jobs:
EOL
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: linuxBinaries
path: out

- name: Upload xmldoc artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: xmldoc
path: extra/doc
Expand Down Expand Up @@ -377,9 +377,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: linuxBinaries
path: linuxBinaries

- name: Install Neko from S3
run: |
Expand Down Expand Up @@ -446,12 +447,13 @@ jobs:
with:
submodules: recursive

- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: linuxBinaries
path: linuxBinaries

- name: Download xmldoc artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: xmldoc
path: xmldoc
Expand Down Expand Up @@ -520,7 +522,7 @@ jobs:
FORCE_COLOR: 1
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -531,7 +533,7 @@ jobs:

- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
with:
image: tonistiigi/binfmt:latest
platforms: all
Expand Down Expand Up @@ -563,7 +565,7 @@ jobs:
EARTHLY_REMOTE_CACHE: "ghcr.io/${{env.CONTAINER_REG}}_cache:build-${{env.CONTAINER_TAG}}-arm64"

- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: linuxArm64Binaries
path: out/linux/arm64
Expand Down Expand Up @@ -606,7 +608,7 @@ jobs:
- name: Install dependencies
env:
# For compatibility with macOS 10.13
ZLIB_VERSION: 1.2.13
ZLIB_VERSION: 1.3
MBEDTLS_VERSION: 2.25.0
PCRE2_VERSION: 10.42
run: |
Expand Down Expand Up @@ -668,7 +670,7 @@ jobs:
otool -L ./haxelib
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: macBinaries
path: out
Expand All @@ -692,9 +694,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: win${{env.ARCH}}Binaries
path: win${{env.ARCH}}Binaries

- name: Install Neko from S3
shell: pwsh
Expand Down Expand Up @@ -784,9 +787,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: win${{env.ARCH}}Binaries
path: win${{env.ARCH}}Binaries

- name: Install Neko from S3
shell: pwsh
Expand Down Expand Up @@ -876,9 +880,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: macBinaries
path: macBinaries

- name: Install Neko from S3
run: |
Expand Down Expand Up @@ -943,7 +948,7 @@ jobs:
uses: actions/checkout@main

- name: Download build artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3

- name: Install awscli
run: |
Expand All @@ -955,7 +960,7 @@ jobs:
- name: Extract branch name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT

- name: Upload binaries
shell: bash
Expand Down Expand Up @@ -1018,7 +1023,7 @@ jobs:
sudo apt-get install -qqy libc6
- name: Download Haxe
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: linuxBinaries
path: linuxBinaries
Expand All @@ -1034,7 +1039,7 @@ jobs:
sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
- name: Download xmldoc artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: xmldoc
path: xmldoc
Expand Down
4 changes: 2 additions & 2 deletions extra/github-actions/build-mac.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: Install dependencies
env:
# For compatibility with macOS 10.13
ZLIB_VERSION: 1.2.13
ZLIB_VERSION: 1.3
MBEDTLS_VERSION: 2.25.0
PCRE2_VERSION: 10.42
run: |
Expand Down Expand Up @@ -63,7 +63,7 @@
otool -L ./haxelib
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: macBinaries
path: out
2 changes: 1 addition & 1 deletion extra/github-actions/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
[ $(ls -1 out | wc -l) -eq "3" ]
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: win${{env.ARCH}}Binaries
path: out
2 changes: 1 addition & 1 deletion extra/github-actions/install-nsis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: choco install nsis
uses: nick-invision/retry@v1
uses: nick-invision/retry@v2
with:
timeout_minutes: 10
max_attempts: 10
Expand Down
37 changes: 21 additions & 16 deletions extra/github-actions/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Extract branch name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT

- name: Build xmldoc
run: |
Expand All @@ -117,13 +117,13 @@ jobs:
EOL
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: linuxBinaries
path: out

- name: Upload xmldoc artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: xmldoc
path: extra/doc
Expand Down Expand Up @@ -153,9 +153,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: linuxBinaries
path: linuxBinaries

@import install-neko-unix.yml

Expand Down Expand Up @@ -206,12 +207,13 @@ jobs:
with:
submodules: recursive

- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: linuxBinaries
path: linuxBinaries

- name: Download xmldoc artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: xmldoc
path: xmldoc
Expand Down Expand Up @@ -264,7 +266,7 @@ jobs:
FORCE_COLOR: 1
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -275,7 +277,7 @@ jobs:

- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
with:
image: tonistiigi/binfmt:latest
platforms: all
Expand Down Expand Up @@ -307,7 +309,7 @@ jobs:
EARTHLY_REMOTE_CACHE: "ghcr.io/${{env.CONTAINER_REG}}_cache:build-${{env.CONTAINER_TAG}}-arm64"

- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: linuxArm64Binaries
path: out/linux/arm64
Expand Down Expand Up @@ -345,9 +347,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- 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
Expand All @@ -371,9 +374,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- 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
Expand All @@ -397,9 +401,10 @@ jobs:
- uses: actions/checkout@main
with:
submodules: recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: macBinaries
path: macBinaries

@import install-neko-unix.yml
@import test-mac.yml
Expand All @@ -416,7 +421,7 @@ jobs:
uses: actions/checkout@main

- name: Download build artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3

- name: Install awscli
run: |
Expand All @@ -428,7 +433,7 @@ jobs:
- name: Extract branch name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT

- name: Upload binaries
shell: bash
Expand Down Expand Up @@ -491,7 +496,7 @@ jobs:
sudo apt-get install -qqy libc6
- name: Download Haxe
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: linuxBinaries
path: linuxBinaries
Expand All @@ -507,7 +512,7 @@ jobs:
sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
- name: Download xmldoc artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: xmldoc
path: xmldoc
Expand Down

0 comments on commit cbfaa5f

Please sign in to comment.