Skip to content

Commit

Permalink
2.4.24.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcin Przepiorowski committed Sep 19, 2024
1 parent 1b43efd commit aec7f4f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ jobs:
- name: Upload OSX
uses: actions/upload-artifact@v4
with:
name: osxbuild
name: osxbuildm1
path: ${{ env.FILENAME }}

ubuntu22:
Expand Down Expand Up @@ -612,7 +612,7 @@ jobs:

release:
runs-on: ubuntu-latest
needs: [centos6, centos7, windows, ubuntu, osx, amazon2023, oel8, docker, ubuntu22]
needs: [centos6, centos7, windows, ubuntu, osx, amazon2023, oel8, docker, ubuntu22, osx-m1]
permissions:
contents: write
steps:
Expand Down Expand Up @@ -642,6 +642,11 @@ jobs:
with:
name: osxbuild

- name: Download osx-m1
uses: actions/download-artifact@v4
with:
name: osxbuildm1


- name: Download OEL8
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -674,6 +679,7 @@ jobs:
FILENAMEUBUNTU="dxtoolkit2-${SOURCE_TAG}-ubuntu1804-installer.tar.gz"
FILENAMEWIN="dxtoolkit2-${SOURCE_TAG}-win64-installer.zip"
FILENAMEOSX="dxtoolkit2-${SOURCE_TAG}-osx.tar.gz"
FILENAMEOSXM1="dxtoolkit2-${SOURCE_TAG}-osx-m1.tar.gz"
FILENAMEAMZ="dxtoolkit2-${SOURCE_TAG}-amazon2023-installer.tar.gz"
FILENAMEUBUNTU22="dxtoolkit2-${SOURCE_TAG}-ubuntu2204-installer.tar.gz"
Expand All @@ -684,6 +690,7 @@ jobs:
echo FILENAMEUBUNTU=$FILENAMEUBUNTU >> $GITHUB_ENV
echo FILENAMEWIN=$FILENAMEWIN >> $GITHUB_ENV
echo FILENAMEOSX=$FILENAMEOSX >> $GITHUB_ENV
echo FILENAMEOSXM1=$FILENAMEOSXM1 >> $GITHUB_ENV
echo FILENAMEAMZ=$FILENAMEAMZ >> $GITHUB_ENV
echo FILENAMEUBUNTU22=$FILENAMEUBUNTU22 >> $GITHUB_ENV
Expand All @@ -695,5 +702,5 @@ jobs:
name: Release ${{ env.SOURCE_TAG }}
draft: true
prerelease: true
artifacts: "cento7build/${{ env.FILENAMERH7 }},cento6build/${{ env.FILENAMERH6 }},oel8build/${{ env.FILENAMERH8 }},ubuntubuild/${{ env.FILENAMEUBUNTU }},windowsbuild/${{ env.FILENAMEWIN }},osxbuild/${{ env.FILENAMEOSX }},amazon2023/${{ env.FILENAMEAMZ }},cento7build/${{ env.FILENAMEUBUNTU22 }}"
artifacts: "cento7build/${{ env.FILENAMERH7 }},cento6build/${{ env.FILENAMERH6 }},oel8build/${{ env.FILENAMERH8 }},ubuntubuild/${{ env.FILENAMEUBUNTU }},windowsbuild/${{ env.FILENAMEWIN }},osxbuild/${{ env.FILENAMEOSX }},amazon2023/${{ env.FILENAMEAMZ }},cento7build/${{ env.FILENAMEUBUNTU22 }},osxbuild/${{ env.FILENAMEOSXM1 }}"
tag: ${{ env.SOURCE_TAG }}
2 changes: 1 addition & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ jobs:
- name: Upload OSX
uses: actions/upload-artifact@v4
with:
name: osxbuild
name: osxbuildm1
path: ${{ env.FILENAME }}


Expand Down

0 comments on commit aec7f4f

Please sign in to comment.