fix condition when generating the task config (#2925)

microsoft · Mar 17, 2023 · 4956cf5 · 4956cf5
1 parent 1f67494
commit 4956cf5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -351,7 +351,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: azure/CLI@v1
         with:
-          inlineScript: az bicep build --file src/deployment/azuredeploy.bicep --stdout > /dev/null
+          inlineScript: |
+           az config set bicep.use_binary_from_path=false
+           az bicep install
+           az bicep build --file src/deployment/azuredeploy.bicep --stdout > /dev/null
   dotnet-fuzzing-tools-linux:
     runs-on: ubuntu-20.04
     steps:

diff --git a/src/ApiService/ApiService/onefuzzlib/Config.cs b/src/ApiService/ApiService/onefuzzlib/Config.cs
@@ -166,7 +166,7 @@ await _containers.GetContainerSasUrl(x.Item2.Name, StorageType.Corpus, ConvertPe
             config.TargetExe = task.Config.Task.TargetExe;
         }
 
-        if (definition.Features.Contains(TaskFeature.TargetExeOptional) && config.TargetExe != null) {
+        if (definition.Features.Contains(TaskFeature.TargetExeOptional) && task.Config.Task.TargetExe != null) {
             config.TargetExe = task.Config.Task.TargetExe;
         }
 

diff --git a/src/ci/get-version.sh b/src/ci/get-version.sh
@@ -12,17 +12,17 @@ GIT_HASH=$(git rev-parse HEAD)
 
 if [ "${GITHUB_REF}" != "" ]; then
     TAG_VERSION=${GITHUB_REF#refs/tags/}
-    
+
     # this isn't a tag
     if [ ${TAG_VERSION} == ${GITHUB_REF} ]; then
-        echo ${BASE_VERSION}-${GIT_HASH}
+        echo ${BASE_VERSION}+${GIT_HASH}
     else
         echo ${BASE_VERSION}
-    fi    
+    fi
 else
     if $(git diff --quiet); then
-        echo ${BASE_VERSION}-${GIT_HASH}
+        echo ${BASE_VERSION}+${GIT_HASH}
     else
-        echo ${BASE_VERSION}-${GIT_HASH}localchanges
-    fi 
+        echo ${BASE_VERSION}+${GIT_HASH}localchanges
+    fi
 fi