h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 10:27:35 +08:00
Code Issues Releases Wiki Activity

Enforce concurrency by using single job

Browse Source 
I've yet again re-confirmed by doubts about using concurrency groups.
It's just not flexible enough. In this case, it cancels any _future_
jobs.
This commit is contained in:
Dan Balasescu 2024-11-11 13:40:17 +09:00
parent 394ff88a62
commit 0b570c4e15
No known key found for this signature in database
1 changed files with 33 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
.github/workflows/_diffcalc_processor.yml vendored
View File

@ -24,10 +24,6 @@ on:
DIFFCALC_GOOGLE_CREDENTIALS: DIFFCALC_GOOGLE_CREDENTIALS:
required: true required: true
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: false
env: env:
GENERATOR_DIR: ${{ github.workspace }}/${{ inputs.id }} GENERATOR_DIR: ${{ github.workspace }}/${{ inputs.id }}
GENERATOR_ENV: ${{ github.workspace }}/${{ inputs.id }}/.env GENERATOR_ENV: ${{ github.workspace }}/${{ inputs.id }}/.env
@ -37,9 +33,15 @@ defaults:
shell: bash -euo pipefail {0} shell: bash -euo pipefail {0}
jobs: jobs:
environment: generator:
name: Setup environment name: Setup environment
runs-on: self-hosted runs-on: self-hosted
timeout-minutes: 720
outputs:
target: ${{ steps.run.outputs.target }}
sheet: ${{ steps.run.outputs.sheet }}
steps: steps:
- name: Checkout diffcalc-sheet-generator - name: Checkout diffcalc-sheet-generator
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -145,13 +147,8 @@ jobs:
sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=0/' "${{ env.GENERATOR_ENV }}" sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=0/' "${{ env.GENERATOR_ENV }}"
fi fi
scores: - name: Query latest scores
name: Setup scores id: query-scores
needs: environment
runs-on: self-hosted
steps:
- name: Query latest data
id: query
run: | run: |
ruleset=$(cat ${{ env.GENERATOR_ENV }} | grep -E '^RULESET=' | cut -d '=' -f2-) ruleset=$(cat ${{ env.GENERATOR_ENV }} | grep -E '^RULESET=' | cut -d '=' -f2-)
performance_data_name=$(curl -s "https://data.ppy.sh/" | grep "performance_${ruleset}_top_1000\b" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g') performance_data_name=$(curl -s "https://data.ppy.sh/" | grep "performance_${ruleset}_top_1000\b" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
@ -160,31 +157,26 @@ jobs:
echo "DATA_NAME=${performance_data_name}" >> "${GITHUB_OUTPUT}" echo "DATA_NAME=${performance_data_name}" >> "${GITHUB_OUTPUT}"
echo "DATA_PKG=${performance_data_name}.tar.bz2" >> "${GITHUB_OUTPUT}" echo "DATA_PKG=${performance_data_name}.tar.bz2" >> "${GITHUB_OUTPUT}"
- name: Restore cache - name: Restore score cache
id: restore-cache id: restore-score-cache
uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2 uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
with: with:
path: ${{ steps.query.outputs.DATA_PKG }} path: ${{ steps.query-scores.outputs.DATA_PKG }}
key: ${{ steps.query.outputs.DATA_NAME }} key: ${{ steps.query-scores.outputs.DATA_NAME }}
- name: Download - name: Download scores
if: steps.restore-cache.outputs.cache-hit != 'true' if: steps.restore-score-cache.outputs.cache-hit != 'true'
run: | run: |
wget -q -O "${{ steps.query.outputs.DATA_PKG }}" "https://data.ppy.sh/${{ steps.query.outputs.DATA_PKG }}" wget -q -O "${{ steps.query-scores.outputs.DATA_PKG }}" "https://data.ppy.sh/${{ steps.query-scores.outputs.DATA_PKG }}"
- name: Extract - name: Extract scores
run: | run: |
tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_PKG }}" tar -I lbzip2 -xf "${{ steps.query-scores.outputs.DATA_PKG }}"
rm -r "${{ steps.query.outputs.TARGET_DIR }}" rm -r "${{ steps.query-scores.outputs.TARGET_DIR }}"
mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}" mv "${{ steps.query-scores.outputs.DATA_NAME }}" "${{ steps.query-scores.outputs.TARGET_DIR }}"
beatmaps: - name: Query latest beatmaps
name: Setup beatmaps id: query-beatmaps
needs: environment
runs-on: self-hosted
steps:
- name: Query latest data
id: query
run: | run: |
beatmaps_data_name=$(curl -s "https://data.ppy.sh/" | grep "osu_files" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g') beatmaps_data_name=$(curl -s "https://data.ppy.sh/" | grep "osu_files" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
@ -192,33 +184,24 @@ jobs:
echo "DATA_NAME=${beatmaps_data_name}" >> "${GITHUB_OUTPUT}" echo "DATA_NAME=${beatmaps_data_name}" >> "${GITHUB_OUTPUT}"
echo "DATA_PKG=${beatmaps_data_name}.tar.bz2" >> "${GITHUB_OUTPUT}" echo "DATA_PKG=${beatmaps_data_name}.tar.bz2" >> "${GITHUB_OUTPUT}"
- name: Restore cache - name: Restore beatmap cache
id: restore-cache id: restore-beatmap-cache
uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2 uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
with: with:
path: ${{ steps.query.outputs.DATA_PKG }} path: ${{ steps.query-beatmaps.outputs.DATA_PKG }}
key: ${{ steps.query.outputs.DATA_NAME }} key: ${{ steps.query-beatmaps.outputs.DATA_NAME }}
- name: Download - name: Download beatmap
if: steps.restore-cache.outputs.cache-hit != 'true' if: steps.restore-beatmap-cache.outputs.cache-hit != 'true'
run: | run: |
wget -q -O "${{ steps.query.outputs.DATA_PKG }}" "https://data.ppy.sh/${{ steps.query.outputs.DATA_PKG }}" wget -q -O "${{ steps.query-beatmaps.outputs.DATA_PKG }}" "https://data.ppy.sh/${{ steps.query-beatmaps.outputs.DATA_PKG }}"
- name: Extract - name: Extract beatmap
run: | run: |
tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_PKG }}" tar -I lbzip2 -xf "${{ steps.query-beatmaps.outputs.DATA_PKG }}"
rm -r "${{ steps.query.outputs.TARGET_DIR }}" rm -r "${{ steps.query-beatmaps.outputs.TARGET_DIR }}"
mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}" mv "${{ steps.query-beatmaps.outputs.DATA_NAME }}" "${{ steps.query-beatmaps.outputs.TARGET_DIR }}"
generator:
name: Run generator
needs: [ environment, scores, beatmaps ]
runs-on: self-hosted
timeout-minutes: 720
outputs:
target: ${{ steps.run.outputs.target }}
sheet: ${{ steps.run.outputs.sheet }}
steps:
- name: Run - name: Run
id: run id: run
run: | run: |
@ -242,13 +225,4 @@ jobs:
run: | run: |
cd "${{ env.GENERATOR_DIR }}" cd "${{ env.GENERATOR_DIR }}"
docker compose down --volumes docker compose down --volumes
cleanup:
name: Cleanup
needs: [ environment, scores, beatmaps, generator ]
runs-on: self-hosted
if: ${{ always() }}
steps:
- name: Cleanup
run: |
rm -rf "${{ env.GENERATOR_DIR }}" rm -rf "${{ env.GENERATOR_DIR }}"