Rename directory used for e2e tests

axel-op · Mar 5, 2024 · af44a70 · af44a70
1 parent ee31b17
commit af44a70
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -82,12 +82,14 @@ jobs:
 
       - name: Test new image
         if: steps.check.outputs.should_push == 'true'
+        env:
+          TEST_DIR: "test-package"
         run: |
           sudo docker run -d -t --name test-container $GHCR_IMAGE_TAG_VERSION
-          sudo docker cp ${GITHUB_WORKSPACE}/test/. test-container:/test
+          sudo docker cp ${GITHUB_WORKSPACE}/$TEST_DIR/. test-container:/$TEST_DIR
           sudo docker cp $GITHUB_EVENT_PATH test-container:/eventpayload
-          sudo docker exec test-container /bin/bash -c "cd /test && git init"
-          sudo docker exec -e GITHUB_WORKSPACE=/test -e GITHUB_EVENT_PATH=/eventpayload -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
+          sudo docker exec test-container /bin/bash -c "cd /$TEST_DIR && git init"
+          sudo docker exec -e GITHUB_WORKSPACE=/$TEST_DIR -e GITHUB_EVENT_PATH=/eventpayload -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
 
       - name: Push new image
         if: steps.check.outputs.should_push == 'true'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,6 +7,7 @@ on: [push, pull_request]
 env:
   IMAGE: axelop/dart-package-analyzer:test
   DOCKERFILE: Dockerfile-parent
+  TEST_DIR: "test-package"
 
 jobs:
   test-outputs:
@@ -20,10 +21,10 @@ jobs:
         id: steptest
         run: |
           sudo docker run -d -t --name test-container $IMAGE
-          sudo docker cp ${GITHUB_WORKSPACE}/test/. test-container:/test
+          sudo docker cp ${GITHUB_WORKSPACE}/$TEST_DIR/. test-container:/$TEST_DIR
           sudo docker cp ${GITHUB_EVENT_PATH} test-container:/event.json
-          sudo docker exec test-container /bin/bash -c "cd /test && git init"
-          sudo docker exec -e GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER -e GITHUB_EVENT_PATH=/event.json -e GITHUB_WORKSPACE=/test -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
+          sudo docker exec test-container /bin/bash -c "cd /$TEST_DIR && git init"
+          sudo docker exec -e GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER -e GITHUB_EVENT_PATH=/event.json -e GITHUB_WORKSPACE=/$TEST_DIR -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
       - name: Test outputs
         env:
           JSON_OUTPUT: ${{ steps.steptest.outputs.json_output }}
@@ -63,7 +64,7 @@ jobs:
 
     strategy:
       matrix:
-        path: ["test", "/test", "./test"]
+        path: ["test-package", "/test-package", "./test-package"]
         analysisoptions: ["analysis_options.yaml", ""]
 
     steps:
@@ -75,9 +76,9 @@ jobs:
           WORKSPACE: /tmp
         run: |
           sudo docker run -d -t --name test-container $IMAGE
-          sudo docker cp ${GITHUB_WORKSPACE}/test/. test-container:$WORKSPACE/test
+          sudo docker cp ${GITHUB_WORKSPACE}/$TEST_DIR/. test-container:$WORKSPACE/$TEST_DIR
           sudo docker cp ${GITHUB_EVENT_PATH} test-container:$WORKSPACE/event.json
-          sudo docker exec test-container /bin/bash -c "cd $WORKSPACE/test && git init"
+          sudo docker exec test-container /bin/bash -c "cd $WORKSPACE/$TEST_DIR && git init"
           sudo docker exec -e GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER -e GITHUB_EVENT_PATH=$WORKSPACE/event.json -e INPUT_RELATIVEPATH=${{ matrix.path }} -e INPUT_CUSTOMANALYSISOPTIONS=${{ matrix.analysisoptions }} -e GITHUB_WORKSPACE=$WORKSPACE -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
 
   test-pubspec-error:
@@ -91,8 +92,8 @@ jobs:
         continue-on-error: true
         run: |
           sudo docker run -d -t --name test-container $IMAGE
-          sudo docker cp ${GITHUB_WORKSPACE}/test/. test-container:/test
+          sudo docker cp ${GITHUB_WORKSPACE}/$TEST_DIR/. test-container:/$TEST_DIR
           sudo docker cp ${GITHUB_EVENT_PATH} test-container:/event.json
-          sudo docker exec test-container /bin/bash -c "cd /test && git init"
-          sudo docker exec test-container /bin/bash -c "rm /test/pubspec.yaml"
-          sudo docker exec -e GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER -e GITHUB_EVENT_PATH=/event.json -e GITHUB_WORKSPACE=/test -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
+          sudo docker exec test-container /bin/bash -c "cd /$TEST_DIR && git init"
+          sudo docker exec test-container /bin/bash -c "rm /$TEST_DIR/pubspec.yaml"
+          sudo docker exec -e GITHUB_RUN_NUMBER=$GITHUB_RUN_NUMBER -e GITHUB_EVENT_PATH=/event.json -e GITHUB_WORKSPACE=/$TEST_DIR -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
diff --git a/test/.gitignore → test-package/.gitignore b/test/.gitignore → test-package/.gitignore
diff --git a/test/.metadata → test-package/.metadata b/test/.metadata → test-package/.metadata
diff --git a/test/CHANGELOG.md → test-package/CHANGELOG.md b/test/CHANGELOG.md → test-package/CHANGELOG.md
diff --git a/test/LICENSE → test-package/LICENSE b/test/LICENSE → test-package/LICENSE
diff --git a/test/README.md → test-package/README.md b/test/README.md → test-package/README.md
diff --git a/test/analysis_options.yaml → test-package/analysis_options.yaml b/test/analysis_options.yaml → test-package/analysis_options.yaml
diff --git a/test/lib/test.dart → test-package/lib/test.dart b/test/lib/test.dart → test-package/lib/test.dart
diff --git a/test/pubspec.lock → test-package/pubspec.lock b/test/pubspec.lock → test-package/pubspec.lock
diff --git a/test/pubspec.yaml → test-package/pubspec.yaml b/test/pubspec.yaml → test-package/pubspec.yaml
diff --git a/test/test/test_test.dart → test-package/test/test_test.dart b/test/test/test_test.dart → test-package/test/test_test.dart