Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Fix condition when generating the task config #2925

Merged
merged 3 commits into from
Mar 17, 2023
Merged

Fix condition when generating the task config #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cc8aea
fix condition when generating the task config
chkeita Mar 16, 2023
6077d09
build fix attempt
chkeita Mar 17, 2023
05326d6
make the version pep 440 compliant
chkeita Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/ApiService/ApiService/onefuzzlib/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
12 changes: 6 additions & 6 deletions src/ci/get-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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