Skip to content

Commit a72ffaf

Browse files
committed
fix linux artifact name
1 parent 87ce290 commit a72ffaf

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,8 +658,8 @@ jobs:
658658
- name: Upload artifact
659659
uses: actions/upload-artifact@v4
660660
with:
661-
name: linuxBinaries${{
662-
retention-days: 1 (matrix.ocaml == '5.3.0' && '_ocaml5') || '' }}
661+
name: linuxBinaries${{ (matrix.ocaml == '5.3.0' && '_ocaml5') || '' }}
662+
retention-days: 1
663663
path: out
664664

665665
linux64-4-3-7-test:

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,15 +678,15 @@ jobs:
678678
- name: 'Download https://haxe.org/website-content/downloads/4.3.7/downloads/haxe-4.3.7-linux64.tar.gz (Unix)'
679679
if: ${{ !startsWith(env.PLATFORM, 'windows') }}
680680
run: |
681-
mkdir ./linuxBinaries${{
682-
curl -sSL https://haxe.org/website-content/downloads/4.3.7/downloads/haxe-4.3.7-linux64.tar.gz -o ./linuxBinaries${{/haxe_bin.tar.gz
681+
mkdir ./linuxBinaries${{ (matrix.ocaml == '5.3.0' && '_ocaml5') || '' }}
682+
curl -sSL https://haxe.org/website-content/downloads/4.3.7/downloads/haxe-4.3.7-linux64.tar.gz -o ./linuxBinaries${{ (matrix.ocaml == '5.3.0' && '_ocaml5') || '' }}/haxe_bin.tar.gz
683683
- name: 'Download https://haxe.org/website-content/downloads/4.3.7/downloads/haxe-4.3.7-linux64.tar.gz (Windows)'
684684
if: ${{ startsWith(env.PLATFORM, 'windows') }}
685685
shell: pwsh
686686
run: |
687-
$DOWNLOADDIR="./linuxBinaries${{"
687+
$DOWNLOADDIR="./linuxBinaries${{ (matrix.ocaml == '5.3.0' && '_ocaml5') || '' }}"
688688
new-item -Name $DOWNLOADDIR -ItemType directory
689-
Invoke-WebRequest https://haxe.org/website-content/downloads/4.3.7/downloads/haxe-4.3.7-linux64.tar.gz -OutFile $DOWNLOADDIR/haxe_bin.tar.gz (matrix.ocaml == '5.3.0' && '_ocaml5') || '' }}
689+
Invoke-WebRequest https://haxe.org/website-content/downloads/4.3.7/downloads/haxe-4.3.7-linux64.tar.gz -OutFile $DOWNLOADDIR/haxe_bin.tar.gz
690690
path: linuxBinaries
691691
692692
- name: Install Neko from S3

extra/github-actions/Main.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ typedef Job = {
3939
class Main {
4040
static final matchHaxeCheckout = ~/([\r\n]\s*)-\s*uses\s*:\s*(actions\/checkout@[A-Za-z0-9.]+)\s*[\r\n](.|\r|\n)+?(?=(\r|\n)\s*-)/gm;
4141
static final matchXmldocTasks = ~/([\r\n]\s*)-\s*name:[\w\s]+xmldoc[\w\s]+\s*:\s*[\w\W]+?(?=\n\n|\n\s*-)/gm;
42-
static final matchUploadArtifact = ~/([\r\n]\s*)-\s*name:[\w\s]+\s*:\s*(actions\/upload-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([a-zA-Z${}.]+)[\w\W]+?(?=\n\n|\n\s*-)/gm;
43-
static final matchDownloadArtifact = ~/([\r\n]\s*)-\s*uses\s*:\s*(actions\/download-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([a-zA-Z${}.]+)/gm;
42+
static final matchUploadArtifact = ~/([\r\n]\s*)-\s*name:[\w\s]+\s*:\s*(actions\/upload-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([\w${}. |&'=()]+)[\w\W]+?(?=\n\n|\n\s*-)/gm;
43+
static final matchDownloadArtifact = ~/([\r\n]\s*)-\s*uses\s*:\s*(actions\/download-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([\w${}. |&'=()]+)/gm;
4444
static final matchHaxeTests = ~/([\r\n]\s*)-\s*name: (Test[\w ()-]*)\s*[\n][\w\W]+?(?=haxe)(haxe RunCi\.hxml)[\w\W]+?(?=working-directory:)(working-directory:\s*([\w${}.\/ ]+))[\w\W]+?(?=\n\n|\n\s*-)/gm;
4545
static final matchHaxeTargets = ~/[\r\n\s]target:\s*\[([\w,\s'"]*)\]/gm;
4646
static final matchOpamInstallHaxe = ~/.*(opam install haxe[a-zA-Z -]*)(?=[0-9]| |\n).*/g;

0 commit comments

Comments
 (0)