diff options
author | kcgen <kcgen@users.noreply.github.com> | 2022-10-15 06:10:46 +0300 |
---|---|---|
committer | kcgen <1557255+kcgen@users.noreply.github.com> | 2022-10-15 09:02:39 +0300 |
commit | 5fcdac3fa70fe2ba2004a0135b702dece442b341 (patch) | |
tree | 5530fa640f57d874f3a9373303956fe2c33d5192 /.github | |
parent | 87e4ea730130b6ff6861a66aa9a9c938445c894e (diff) |
Update CI variable-sharing syntax
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/analysis.yml | 12 | ||||
-rw-r--r-- | .github/workflows/config.yml | 7 | ||||
-rw-r--r-- | .github/workflows/linux.yml | 18 | ||||
-rw-r--r-- | .github/workflows/macos.yml | 14 | ||||
-rw-r--r-- | .github/workflows/platforms.yml | 2 | ||||
-rw-r--r-- | .github/workflows/windows-msvc.yml | 4 | ||||
-rw-r--r-- | .github/workflows/windows-msys2.yml | 14 |
7 files changed, 35 insertions, 36 deletions
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index af562639d..577a55275 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -65,9 +65,9 @@ jobs: shell: bash run: | mkdir -p "${CCACHE_DIR}" - echo "::set-output name=dir::$CCACHE_DIR" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" + echo "dir=$CCACHE_DIR" >> $GITHUB_OUTPUT + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-ccache @@ -172,9 +172,9 @@ jobs: shell: bash run: | mkdir -p "${CCACHE_DIR}" - echo "::set-output name=dir::$CCACHE_DIR" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" + echo "dir=$CCACHE_DIR" >> $GITHUB_OUTPUT + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-ccache diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 3ea318217..3e8b83868 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -18,7 +18,7 @@ jobs: submodules: false - id: commit-check - run: 'echo ::set-output name=has-commits::$(./scripts/has-commits-since.sh "24 hours ago")' + run: echo "has-commits=$(./scripts/has-commits-since.sh '24 hours ago')" >> $GITHUB_OUTPUT outputs: has-commits: ${{ steps.commit-check.outputs.has-commits }} @@ -62,13 +62,12 @@ jobs: - name: Check repo for commits id: repo-meta shell: bash - run: 'echo ::set-output name=has-commits::$(./scripts/has-commits-since.sh "24 hours ago")' - + run: echo "has-commits=$(./scripts/has-commits-since.sh '24 hours ago')" >> $GITHUB_OUTPUT - name: Get Date id: get-date if: matrix.system.name == 'Windows' shell: bash - run: echo ::set-output name=date::$(date +%Y-%W) + run: echo "date=$(date +%Y-%W)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-msys2 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bd65b2a9d..a1e76ec24 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -114,10 +114,10 @@ jobs: shell: bash run: | mkdir -p "${CCACHE_DIR}" - echo "::set-output name=dir::$CCACHE_DIR" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" - echo "::set-output name=name_hash::$(echo '${{ matrix.conf.name }}' | shasum | cut -b-8)" + echo "dir=$CCACHE_DIR" >> $GITHUB_OUTPUT + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT + echo "name_hash=$(echo '${{ matrix.conf.name }}' | shasum | cut -b-8)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-ccache @@ -183,9 +183,9 @@ jobs: shell: bash run: | mkdir -p "${CCACHE_DIR}" - echo "::set-output name=dir::$CCACHE_DIR" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" + echo "dir=$CCACHE_DIR" >> $GITHUB_OUTPUT + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-ccache @@ -239,8 +239,8 @@ jobs: run: | sudo mkdir -p "${CLAMDB_DIR}" sudo chmod 777 "${CLAMDB_DIR}" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-clamdb with: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b32dbde19..5af03c895 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -86,10 +86,10 @@ jobs: mkdir -p "$DISCARD_DIR" mv -f "$BREW_DIR"/* "$DISCARD_DIR" mkdir -p "$CCACHE_DIR" - echo "::set-output name=brew_dir::$BREW_DIR" - echo "::set-output name=ccache_dir::$CCACHE_DIR" - echo "::set-output name=today::$(date +%F)" - echo "::set-output name=name_hash::$(echo '${{ matrix.conf.name }} ${{ matrix.conf.arch }}' | shasum | cut -b-8)" + echo "brew_dir=$BREW_DIR" >> $GITHUB_OUTPUT + echo "ccache_dir=$CCACHE_DIR" >> $GITHUB_OUTPUT + echo "today=$(date +%F)" >> $GITHUB_OUTPUT + echo "name_hash=$(echo '${{ matrix.conf.name }} ${{ matrix.conf.arch }}' | shasum | cut -b-8)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 if: matrix.conf.needs_deps @@ -198,9 +198,9 @@ jobs: mkdir -p "$DISCARD_DIR" mv -f "$BREW_DIR"/* "$DISCARD_DIR" mkdir -p "$CCACHE_DIR" - echo "::set-output name=brew_dir::$BREW_DIR" - echo "::set-output name=ccache_dir::$CCACHE_DIR" - echo "::set-output name=today::$(date +%F)" + echo "brew_dir=$BREW_DIR" >> $GITHUB_OUTPUT + echo "ccache_dir=$CCACHE_DIR" >> $GITHUB_OUTPUT + echo "today=$(date +%F)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 if: matrix.runner.needs_deps diff --git a/.github/workflows/platforms.yml b/.github/workflows/platforms.yml index 5b5cac4fb..ea6feb590 100644 --- a/.github/workflows/platforms.yml +++ b/.github/workflows/platforms.yml @@ -18,7 +18,7 @@ jobs: submodules: false - id: commit-check - run: 'echo ::set-output name=has-commits::$(./scripts/has-commits-since.sh "24 hours ago")' + run: echo "has-commits=$(./scripts/has-commits-since.sh '24 hours ago')" >> $GITHUB_OUTPUT outputs: has-commits: ${{ steps.commit-check.outputs.has-commits }} diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml index ee028c0ea..2720a785f 100644 --- a/.github/workflows/windows-msvc.yml +++ b/.github/workflows/windows-msvc.yml @@ -158,7 +158,7 @@ jobs: # inject version based on vcs sed -i "s|DOSBOX_DETAILED_VERSION \"git\"|DOSBOX_DETAILED_VERSION \"$VERSION\"|" src/platform/visualc/config.h echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "::set-output name=dosbox_vers::${VERSION}" + echo "dosbox_vers=${VERSION}" >> $GITHUB_OUTPUT - name: Enable the debugger in config.h if: ${{ matrix.conf.debugger }} @@ -178,7 +178,7 @@ jobs: id: set_pkg_dir shell: bash run: | - echo "::set-output name=pkg_dir::dosbox-staging-windows-${{ matrix.conf.arch }}-${{ env.VERSION }}" + echo "pkg_dir=dosbox-staging-windows-${{ matrix.conf.arch }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT - name: Package standard build if: ${{ !matrix.conf.debugger }} diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml index f01341445..e0bcb38ff 100644 --- a/.github/workflows/windows-msys2.yml +++ b/.github/workflows/windows-msys2.yml @@ -107,10 +107,10 @@ jobs: id: prep-ccache run: | mkdir -p "${CCACHE_DIR}" - echo "::set-output name=dir::$(cygpath -w $CCACHE_DIR)" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" - echo "::set-output name=name_hash::$(echo '${{ matrix.conf.name }}' | shasum | cut -b-8)" + echo "dir=$(cygpath -w $CCACHE_DIR)" >> $GITHUB_OUTPUT + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT + echo "name_hash=$(echo '${{ matrix.conf.name }}' | shasum | cut -b-8)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-ccache @@ -206,9 +206,9 @@ jobs: id: prep-ccache run: | mkdir -p "${CCACHE_DIR}" - echo "::set-output name=dir::$(cygpath -w $CCACHE_DIR)" - echo "::set-output name=today::$(date -I)" - echo "::set-output name=yesterday::$(date --date=yesterday -I)" + echo "dir=$(cygpath -w $CCACHE_DIR)" >> $GITHUB_OUTPUT + echo "today=$(date -I)" >> $GITHUB_OUTPUT + echo "yesterday=$(date --date=yesterday -I)" >> $GITHUB_OUTPUT - uses: actions/cache@v3.0.11 id: cache-ccache |