diff --git a/build/azure-pipelines/copilot/setup-steps.yml b/build/azure-pipelines/copilot/setup-steps.yml index 174d18b8e7c..21187a795f3 100644 --- a/build/azure-pipelines/copilot/setup-steps.yml +++ b/build/azure-pipelines/copilot/setup-steps.yml @@ -37,21 +37,11 @@ steps: - task: Cache@2 inputs: - key: '"copilot_build_cache" | $(Build.SourcesDirectory)/extensions/copilot/build/.cachesalt | $(Build.SourcesDirectory)/extensions/copilot/build/setup-emsdk.sh | $(Build.SourcesDirectory)/extensions/copilot/package-lock.json' + key: '"copilot_build_cache" | $(Build.SourcesDirectory)/extensions/copilot/build/.cachesalt | $(Build.SourcesDirectory)/extensions/copilot/package-lock.json' path: $(Build.SourcesDirectory)/extensions/copilot/.build/build_cache cacheHitVar: BUILD_CACHE_RESTORED displayName: Restore copilot build cache - - script: $(Build.SourcesDirectory)/extensions/copilot/build/setup-emsdk.sh - displayName: Setup emsdk - condition: and(succeeded(), ne(variables.BUILD_CACHE_RESTORED, 'true')) - - script: echo '##vso[task.prependpath]/opt/dev/emsdk/upstream/emscripten' - displayName: Setup emsdk path 1 - condition: and(succeeded(), ne(variables.BUILD_CACHE_RESTORED, 'true')) - - script: echo '##vso[task.prependpath]/opt/dev/emsdk' - displayName: Setup emsdk path 2 - condition: and(succeeded(), ne(variables.BUILD_CACHE_RESTORED, 'true')) - - script: tar -xzf .build/build_cache/cache.tgz workingDirectory: $(Build.SourcesDirectory)/extensions/copilot condition: and(succeeded(), eq(variables.BUILD_CACHE_RESTORED, 'true')) diff --git a/extensions/copilot/build/setup-emsdk.sh b/extensions/copilot/build/setup-emsdk.sh deleted file mode 100755 index 8ff9d113089..00000000000 --- a/extensions/copilot/build/setup-emsdk.sh +++ /dev/null @@ -1,7 +0,0 @@ -mkdir -p /opt/dev \ -&& cd /opt/dev \ -&& git clone https://github.com/emscripten-core/emsdk.git \ -&& cd /opt/dev/emsdk \ -&& git reset --hard 0fde04880048f743056bed17cb0543a42e040fae \ -&& ./emsdk install 3.1.55 \ -&& ./emsdk activate 3.1.55