Skip to content

Commit ced0f08

Browse files
committed
fix: Fixes after pull request
1 parent 810064c commit ced0f08

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/run-tests-and-package.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,10 @@ jobs:
423423
if [[ ${{ github.event_name == 'workflow_dispatch' }} == true ]]; then echo "LOOTLOCKER_URL=${{ INPUTS.LL_URL }}" | sed -e 's/https:\/\///g' >> $GITHUB_ENV; elif [ ${{ vars.LL_USE_STAGE }} == 'true' ]; then echo "LOOTLOCKER_URL=${{ SECRETS.LOOTLOCKER_API_STAGE_URL }}" | sed -e 's/https:\/\///g' >> $GITHUB_ENV; elif [ ${{ vars.LL_USE_LOCAL_BACKEND }} == 'true' ]; then echo "LOOTLOCKER_URL=localhost:8080" >> $GITHUB_ENV; else echo "LOOTLOCKER_URL=${{ SECRETS.LOOTLOCKER_API_PRODUCTION_URL }}" | sed -e 's/https:\/\///g' >> $GITHUB_ENV; fi
424424
if [[ ${{ github.event_name == 'workflow_dispatch' }} == true ]]; then echo "TARGET_ENVIRONMENT=CUSTOM" >> $GITHUB_ENV; echo "USE_TAILSCALE=true" >> $GITHUB_ENV; elif [ ${{ vars.LL_USE_STAGE }} == 'true' ]; then echo "TARGET_ENVIRONMENT=STAGE" >> $GITHUB_ENV; echo "USE_TAILSCALE=true" >> $GITHUB_ENV; elif [ ${{ vars.LL_USE_LOCAL_BACKEND }} == 'true' ]; then echo "TARGET_ENVIRONMENT=LOCAL" >> $GITHUB_ENV; echo "USE_TAILSCALE=false" >> $GITHUB_ENV; else echo "TARGET_ENVIRONMENT=PRODUCTION" >> $GITHUB_ENV; echo "USE_TAILSCALE=false" >> $GITHUB_ENV; fi
425425
COINFLIP=$(($RANDOM%${{ vars.LL_USE_LEGACY_HTTP_ONE_IN }}))
426+
echo "Coinflip resulted in $COINFLIP"
426427
if [[ $COINFLIP -lt 1 ]]; then echo "USE_HTTP_EXECUTION_QUEUE=false" >> $GITHUB_ENV; else echo "USE_HTTP_EXECUTION_QUEUE=true" >> $GITHUB_ENV; fi
427428
COINFLIP=$(($RANDOM%2))
429+
echo "Coinflip resulted in $COINFLIP"
428430
if [[ $COINFLIP -lt 1 ]]; then echo "JSON_LIBRARY=newtonsoft" >> $GITHUB_ENV; else echo "JSON_LIBRARY=zerodep" >> $GITHUB_ENV; fi
429431
- name: Checkout this repository
430432
uses: actions/checkout@v4
@@ -489,11 +491,11 @@ jobs:
489491
- name: Set test category to full ci when PR to main
490492
if: ${{ github.event_name == 'pull_request' && github.base_ref == 'main' }}
491493
run: |
492-
echo "TEST_CATEGORY=-testcategory LootLockerCI" >> $GITHUB_ENV
494+
echo 'TEST_CATEGORY=-testCategory "LootLockerCI"' >> $GITHUB_ENV
493495
- name: Set test category to minimal ci
494496
if: ${{ github.event_name != 'pull_request' || github.base_ref != 'main' }}
495497
run: |
496-
echo "TEST_CATEGORY=-testcategory LootLockerCIFast" >> $GITHUB_ENV
498+
echo 'TEST_CATEGORY=-testCategory "LootLockerCIFast"' >> $GITHUB_ENV
497499
####### RUN TESTS ###########
498500
- name: Cache Libraries
499501
if: ${{ vars.ENABLE_INTEGRATION_TESTS == 'true' }}
@@ -606,6 +608,7 @@ jobs:
606608
validate-sdk:
607609
name: Validate SDK
608610
runs-on: [ubuntu-latest]
611+
if: ${{ true == false }}
609612
needs: [editor-smoke-test]
610613
timeout-minutes: 8
611614
env:

Tests/LootLockerTestUtils/LootLockerTestConfigurationMetadata.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
using System.Collections.Generic;
44
using LootLocker;
55

6+
#if LOOTLOCKER_USE_NEWTONSOFTJSON
7+
using Newtonsoft.Json.Linq;
8+
#endif
9+
610
namespace LootLockerTestConfigurationUtils
711
{
812
public class LootLockerTestMetadata

0 commit comments

Comments
 (0)