From 890810e9b6c683c04e6e61e03a33fa72cff96bf6 Mon Sep 17 00:00:00 2001 From: Michael Messer <16529951+michaelmesser@users.noreply.github.com> Date: Thu, 20 May 2021 05:21:39 -0400 Subject: [PATCH] Remove unsecure commands (#1433) --- .github/workflows/ci-lint.yml | 3 --- .github/workflows/ci-macos-combined.yml | 7 +++---- .github/workflows/ci-ubuntu-combined.yml | 15 +++++++-------- .github/workflows/ci-windows.yml | 11 +++++------ 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index ee7d3f863..a115c7478 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -9,9 +9,6 @@ on: branches: - master -env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/ci-macos-combined.yml b/.github/workflows/ci-macos-combined.yml index 74ea70f6c..809f50f46 100644 --- a/.github/workflows/ci-macos-combined.yml +++ b/.github/workflows/ci-macos-combined.yml @@ -12,7 +12,6 @@ on: env: SCHEME: chez IDRIS2_TESTS_CG: chez - ACTIONS_ALLOW_UNSECURE_COMMANDS: true jobs: @@ -27,7 +26,7 @@ jobs: run: | brew install chezscheme brew install coreutils - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH - name: Build Idris 2 from bootstrap run: make bootstrap && make install shell: bash @@ -54,7 +53,7 @@ jobs: run: | brew install chezscheme brew install coreutils - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH chmod +x $HOME/.idris2/bin/idris2 $HOME/.idris2/bin/idris2_app/* - name: Build self-hosted run: make all && make install @@ -83,7 +82,7 @@ jobs: # brew install gambit-scheme # CURRENTDIR=$(find /usr/local/Cellar/gambit-scheme -type l -name current) # echo "::add-path::${CURRENTDIR}/bin" - # echo "::add-path::$HOME/.idris2/bin" + # echo "$HOME/.idris2/bin" >> $GITHUB_PATH # chmod +x $HOME/.idris2/bin/idris2 $HOME/.idris2/bin/idris2_app/* # - name: Test gambit # run: cd tests/gambit/bitops001/ && ./run idris2 diff --git a/.github/workflows/ci-ubuntu-combined.yml b/.github/workflows/ci-ubuntu-combined.yml index 017da67da..b9a721863 100644 --- a/.github/workflows/ci-ubuntu-combined.yml +++ b/.github/workflows/ci-ubuntu-combined.yml @@ -12,7 +12,6 @@ on: - main env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true IDRIS2_VERSION: 0.3.0 # For previous-version build SCHEME: scheme @@ -33,7 +32,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y chezscheme - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH - name: Build from bootstrap run: make bootstrap && make install - name: Artifact Bootstrapped Idris2 @@ -53,7 +52,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y racket - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH - name: Build from bootstrap run: make bootstrap-racket && make install - name: Artifact Bootstrapped Idris2 @@ -73,7 +72,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y chezscheme - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH - name: Cache Chez Previous Version id: previous-version-cache uses: actions/cache@v2 @@ -120,7 +119,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y chezscheme - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH chmod +x $HOME/.idris2/bin/idris2 $HOME/.idris2/bin/idris2_app/* - name: Build self-hosted run: make all && make install @@ -144,7 +143,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y racket - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH chmod +x $HOME/.idris2/bin/idris2 $HOME/.idris2/bin/idris2_app/* - name: Build self-hosted run: make all && make install @@ -168,7 +167,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y chezscheme - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH chmod +x $HOME/.idris2/bin/idris2 $HOME/.idris2/bin/idris2_app/* - name: Build from previous version run: make all && make install && make clean @@ -199,7 +198,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get install -y chezscheme - echo "::add-path::$HOME/.idris2/bin" + echo "$HOME/.idris2/bin" >> $GITHUB_PATH chmod +x $HOME/.idris2/bin/idris2 $HOME/.idris2/bin/idris2_app/* - name: Build API run: make install-api diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 3aa245edb..05dbfd11e 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -14,7 +14,6 @@ env: SCHEME: scheme IDRIS2_TESTS_CG: chez CC: gcc - ACTIONS_ALLOW_UNSECURE_COMMANDS: true jobs: build: @@ -29,7 +28,7 @@ jobs: run: | git clone --depth 1 https://github.com/cisco/ChezScheme c:\msys64\usr\bin\bash -l -c "pacman -S --noconfirm tar make" - echo "::set-env name=PWD::$(c:\msys64\usr\bin\cygpath -u $(pwd))" + echo "PWD=$(c:\msys64\usr\bin\cygpath -u $(pwd))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Configure and Build Chez Scheme run: | c:\msys64\usr\bin\bash -l -c "cd $env:PWD && cd ChezScheme && ./configure --threads && make" @@ -37,10 +36,10 @@ jobs: run: | $chez="$(pwd)\ChezScheme\ta6nt\bin\ta6nt" $idris="$(pwd)\.idris2" - echo "::add-path::$chez" - echo "::add-path::$idris\bin" - echo "::set-env name=IDRIS_PREFIX::$idris" - echo "::set-env name=PREFIX::$(c:\msys64\usr\bin\cygpath -u $idris)" + echo "$chez" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "$idris\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "IDRIS_PREFIX=$idris" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "PREFIX=$(c:\msys64\usr\bin\cygpath -u $idris)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Test Scheme run: | scheme --version