upgrade action dependencies (#72)

Author: WebFreak001

.github/workflows/run-test-sh.yml

@@ -30,20 +30,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: false
           load: true
@@ -56,11 +56,12 @@ jobs:
         run: ./test.sh "dlangtour/core-exec:${{ matrix.version }}"
 
       - name: Push image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
           load: false
           tags: dlangtour/core-exec:${{ matrix.version }}
           build-args: |
             DLANG_VERSION=${{ matrix.version }}
             DLANG_EXEC=${{ matrix.exec }}
+

packages.txt

@@ -11,7 +11,7 @@ mir
 stdx-allocator
 lubeck
 numir
-vibe-d:0.9.6-beta.1
+vibe-d
 dyaml
 libdparse
 emsi_containers

test.sh

@@ -30,10 +30,35 @@ grepOutput() {
     exit 1
 }
 
+exactOutput() {
+    local output_file="command_output.tmp"
+    local expect_file="command_expect.tmp"
+
+    echo -n "${@:$#}" | xargs > $expect_file
+
+    if ! "${@:1:(($# - 1))}" | xargs > $output_file
+    then
+        echo "Command failed!"
+
+    elif ! diff -up $output_file $expect_file
+    then
+        echo "Output didn't match expected test"
+    else
+        rm $output_file
+        rm $expect_file
+        return 0
+    fi
+
+    cat $output_file
+    rm $output_file
+    rm $expect_file
+    exit 1
+}
+
 # simple hello world
 source='void main() { import std.stdio; writeln("Hello World"); }'
 bsource=$(echo $source | base64 -w0)
-[ "$(docker run --rm $dockerId $bsource)" == "Hello World" ]
+exactOutput docker run --rm $dockerId $bsource "Hello World"
 
 # stdin
 source='void main() { import std.algorithm, std.stdio; stdin.byLine.each!writeln;}'
@@ -45,32 +70,32 @@ output="$(docker run --rm $dockerId $bsource $bstdin)"
 # custom arguments
 source='void main() { import std.stdio; version(Foo) writeln("Hello World"); }'
 bsource=$(echo $source | base64 -w0)
-[ "$(DOCKER_FLAGS="-version=Fooo" docker run -e DOCKER_FLAGS --rm $dockerId $bsource)" == "" ]
+exactOutput env DOCKER_FLAGS="-version=Fooo" docker run -e DOCKER_FLAGS --rm $dockerId $bsource ""
 [ "$(DOCKER_FLAGS="-version=Foo" docker run -e DOCKER_FLAGS --rm $dockerId $bsource)" != "Hello world" ]
 [ "$(DOCKER_FLAGS="-version=Bar -version=Foo" docker run -e DOCKER_FLAGS --rm $dockerId $bsource)" != "Hello world" ]
 
 # test runtime args
 source='void main(string[] args) { import std.stdio; writeln(args[1..$]); }'
 bsource=$(echo $source | base64 -w0)
-[ "$(DOCKER_RUNTIME_ARGS="foo -test=bar" docker run -e DOCKER_RUNTIME_ARGS --rm $dockerId $bsource)" == "[\"foo\", \"-test=bar\"]" ]
+exactOutput env DOCKER_RUNTIME_ARGS="foo -test=bar" docker run -e DOCKER_RUNTIME_ARGS --rm $dockerId $bsource "[\"foo\", \"-test=bar\"]"
 
 ## dub file
 source='/++dub.sdl: name"foo"+/ void main() { import std.stdio; writeln("Hello World"); }'
 bsource=$(echo "$source" | base64 -w0)
-[ "$(docker run --rm $dockerId $bsource)" == "Hello World" ]
+exactOutput docker run --rm $dockerId "$bsource" "Hello World"
 
 source="/++dub.sdl: name\"foo\" \n dependency\"mir\" version=\"*\"+/ void main() { import mir.combinatorics, std.stdio; writeln([0, 1].permutations); }"
 bsource=$(echo -e "$source" | base64 -w0)
-[ "$(docker run --rm "$dockerId" "$bsource")" == "[[0, 1], [1, 0]]" ]
+grepOutput docker run --rm $dockerId "$bsource" "[[0, 1], [1, 0]]"
 
-source="/++dub.sdl: name\"foo\" \n dependency\"vibe-d\" version=\"*\"+/ void main() { import vibe.d, std.stdio; Json a; a.writeln; }"
+source="/++dub.sdl: name\"foo\" \n dependency\"vibe-d\" version=\">=0.9.7\"+/ void main() { import vibe.d, std.stdio; auto a = Json(\"hello world\"); a.writeln; }"
 bsource=$(echo -e "$source" | base64 -w0)
-[ "$(docker run --rm "$dockerId" "$bsource")" == "null" ]
+grepOutput docker run --rm $dockerId "$bsource" "\"hello world\""
 
 ## dub file with unittest
 source="/++dub.sdl: name\"foo\" \n dependency\"mir\" version=\"*\"+/ unittest { import mir.combinatorics, std.stdio; writeln([0, 1].permutations); } version(unittest) {} else { void main() { } } "
 bsource=$(echo -e "$source" | base64 -w0)
-[ "$(DOCKER_FLAGS="-unittest" docker run -e DOCKER_FLAGS --rm $dockerId $bsource)" == "[[0, 1], [1, 0]]" ]
+grepOutput env DOCKER_FLAGS="-unittest" docker run -e DOCKER_FLAGS --rm $dockerId $bsource "[[0, 1], [1, 0]]"
 
 # Test -c
 source='void main() { static assert(0); }'
@@ -142,7 +167,7 @@ void main() {
 EOF
 )
 bsource=$(echo "$source" | base64 -w0)
-[ "$(docker run --rm $dockerId $bsource)" == "Hello World" ]
+exactOutput docker run --rm $dockerId $bsource "Hello World"
 
 # Check dpp Hello World with HAR
 source=$(cat <<EOF
@@ -168,4 +193,4 @@ void main() {
 EOF
 )
 bsource=$(echo "$source" | base64 -w0)
-[ "$(docker run --rm $dockerId $bsource)" == "30" ]
+exactOutput docker run --rm $dockerId $bsource "30"