Skip to content

ci: branch split (fs2024) #10645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
FoxtrotSierra6829 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ci: branch split (fs2024) #10645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a32nx/master
CDN_BUCKET_DESTINATION: addons/msfs2024/a32nx/master
run: |
./scripts/cf-cdn.sh ./fbw-a32nx/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/master-8k
CDN_BUCKET_DESTINATION: addons/msfs2024/a380x/master-8k
run: |
./scripts/cf-cdn.sh ./fbw-a380x/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down Expand Up @@ -386,7 +386,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/master-4k
CDN_BUCKET_DESTINATION: addons/msfs2024/a380x/master-4k
run: |
./scripts/cf-cdn.sh ./fbw-a380x/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build-8k.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: PR Tests & Build (8K)
name: PR Tests & Build (FS2024 | 8K)
on:
pull_request:
types:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: PR Tests & Build
name: PR Tests & Build (FS2024)
on:
pull_request:
types:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-closed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Remove QA config entries
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
ADDON_KEYS: a32nx-msfs2020,a32nx-msfs2024,a380x-msfs2020,a380x-msfs2024
ADDON_KEYS: a32nx-msfs2024,a380x-msfs2024
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: installer/qa-config
Expand All @@ -63,9 +63,9 @@ jobs:
- name: Remove PR files from CloudFlare CDN
env:
R2_BUCKET: flybywiresim
CDN_BUCKET_DESTINATION_A32NX: addons/a32nx/pr-${{ github.event.pull_request.number }}
CDN_BUCKET_DESTINATION_A380X_4K: addons/a380x/pr-${{ github.event.pull_request.number }}-4k
CDN_BUCKET_DESTINATION_A380X_8K: addons/a380x/pr-${{ github.event.pull_request.number }}-8k
CDN_BUCKET_DESTINATION_A32NX: addons/msfs2024/a32nx/pr-${{ github.event.pull_request.number }}
CDN_BUCKET_DESTINATION_A380X_4K: addons/msfs2024/a380x/pr-${{ github.event.pull_request.number }}-4k
CDN_BUCKET_DESTINATION_A380X_8K: addons/msfs2024/a380x/pr-${{ github.event.pull_request.number }}-8k
run: |
rclone delete cloudflare-r2:$R2_BUCKET/$CDN_BUCKET_DESTINATION_A32NX || true
rclone delete cloudflare-r2:$R2_BUCKET/$CDN_BUCKET_DESTINATION_A380X_4K || true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-updated.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
PR_NUMBER: ${{ github.event.pull_request.number }}
PR_TITLE: ${{ github.event.pull_request.title }}
PR_BODY: ${{ github.event.pull_request.body }}
ADDON_KEYS: a32nx-msfs2020,a32nx-msfs2024,a380x-msfs2020,a380x-msfs2024
ADDON_KEYS: a32nx-msfs2024,a380x-msfs2024
run: node ./scripts/update_qa_config.js
- name: Upload QA config to CDN
if: github.event.pull_request.auto_merge == false && steps.update_config.outputs.tracks-updated == 'true'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-upload-8k.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Upload PR for Installer QA (8K)
on:
workflow_run:
workflows: ['PR Tests & Build (8K)']
workflows: ['PR Tests & Build (FS2020 | 8K)','PR Tests & Build (FS2024 | 8K)']
types:
- completed

Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/pr-${{ steps.pr.outputs.number }}-8k
CDN_BUCKET_DESTINATION: addons/${{ contains(github.event.workflow_run.name, 'FS2024') && 'msfs2024' || 'msfs2020' }}/a380x/pr-${{ steps.pr.outputs.number }}-8k
run: |
./scripts/cf-cdn.sh /tmp/artifacts/build-modules-a380x-8k $CDN_BUCKET_DESTINATION
- name: Lock QA config
Expand All @@ -98,7 +98,7 @@ jobs:
PR_NUMBER: ${{ steps.pr.outputs.number }}
PR_TITLE: ${{ steps.pr.outputs.title }}
PR_BODY: ${{ steps.pr.outputs.body }}
ADDON_KEYS: a380x-msfs2020,a380x-msfs2024
ADDON_KEYS: ${{ contains(github.event.workflow_run.name, 'FS2024') && 'a380x-msfs2024' || 'a380x-msfs2020' }}
TEXTURE_QUALITY: 8k
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Upload PR for Installer QA
on:
workflow_run:
workflows: ['PR Tests & Build']
workflows: ['PR Tests & Build (FS2020)', 'PR Tests & Build (FS2024)']
types:
- completed

Expand Down Expand Up @@ -87,15 +87,15 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a32nx/pr-${{ steps.pr.outputs.number }}
CDN_BUCKET_DESTINATION: addons/${{ contains(github.event.workflow_run.name, 'FS2024') && 'msfs2024' || 'msfs2020' }}/a32nx/pr-${{ steps.pr.outputs.number }}
run: |
./scripts/cf-cdn.sh /tmp/artifacts/build-modules-a32nx $CDN_BUCKET_DESTINATION
- name: Upload A380X to CloudFlare CDN (Installer)
if: steps.artifacts.outputs.found == 'true'
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/pr-${{ steps.pr.outputs.number }}-4k
CDN_BUCKET_DESTINATION: addons/${{ contains(github.event.workflow_run.name, 'FS2024') && 'msfs2024' || 'msfs2020' }}/a380x/pr-${{ steps.pr.outputs.number }}-4k
run: |
./scripts/cf-cdn.sh /tmp/artifacts/build-modules-a380x-4k $CDN_BUCKET_DESTINATION
- name: Lock QA config
Expand All @@ -106,7 +106,7 @@ jobs:
PR_NUMBER: ${{ steps.pr.outputs.number }}
PR_TITLE: ${{ steps.pr.outputs.title }}
PR_BODY: ${{ steps.pr.outputs.body }}
ADDON_KEYS: a32nx-msfs2020,a32nx-msfs2024,a380x-msfs2020,a380x-msfs2024
ADDON_KEYS: ${{ contains(github.event.workflow_run.name, 'FS2024') && 'a32nx-msfs2024,a380x-msfs2024' || 'a32nx-msfs2020,a380x-msfs2020' }}
TEXTURE_QUALITY: 4k
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a32nx/stable-rc
CDN_BUCKET_DESTINATION: addons/msfs2024/a32nx/stable-rc
run: |
./scripts/cf-cdn.sh ./fbw-a32nx/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/stable-rc-8k
CDN_BUCKET_DESTINATION: addons/msfs2024/a380x/stable-rc-8k
run: |
./scripts/cf-cdn.sh ./fbw-a380x/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down Expand Up @@ -377,7 +377,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/stable-rc-4k
CDN_BUCKET_DESTINATION: addons/msfs2024/a380x/stable-rc-4k
run: |
./scripts/cf-cdn.sh ./fbw-a380x/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a32nx/stable
CDN_BUCKET_DESTINATION: addons/msfs2024/a32nx/stable
run: |
./scripts/cf-cdn.sh ./fbw-a32nx/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/stable-8k
CDN_BUCKET_DESTINATION: addons/msfs2024/a380x/stable-8k
run: |
./scripts/cf-cdn.sh ./fbw-a380x/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down Expand Up @@ -417,7 +417,7 @@ jobs:
env:
CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
CDN_BUCKET_DESTINATION: addons/a380x/stable-4k
CDN_BUCKET_DESTINATION: addons/msfs2024/a380x/stable-4k
run: |
./scripts/cf-cdn.sh ./fbw-a380x/out/build-modules $CDN_BUCKET_DESTINATION
- name: Build Standalone Download files
Expand Down
9 changes: 3 additions & 6 deletions scripts/add_qa_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,10 @@ function createTrack(addonKey, prNumber, prTitle, prBody, textureQuality) {
const trackKey = `${addonPrefix}-pr-${prNumber}${textureQualitySuffix}`;
const trackName = `PR #${prNumber} ${addonKey.startsWith('a380x') ? `(${textureQuality.toUpperCase()})` : ''} | ${prTitle}`;
const description = `## [${prTitle} #${prNumber}](https://github.com/${GITHUB_REPO}/pull/${prNumber})\n\n${prBody}`;
const addon = addonKey.includes('a32nx') ? 'a32nx' : addonKey.includes('a380x') ? 'a380x' : addonKey;
const simulator = addonKey.includes('fs2024') ? 'msfs2024' : addonKey.includes('fs2020') ? 'msfs2020' : '';

let baseUrl;
if (addonKey.startsWith('a32nx')) {
baseUrl = `https://flybywirecdn.com/addons/a32nx/pr-${prNumber}`;
} else if (addonKey.startsWith('a380x')) {
baseUrl = `https://flybywirecdn.com/addons/a380x/pr-${prNumber}-${textureQuality}`;
}
const baseUrl = `https://flybywirecdn.com/addons/${simulator}/${addon}/pr-${prNumber}`;

return {
name: trackName,
Expand Down
2 changes: 1 addition & 1 deletion scripts/cf-cdn.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RCLONE_REMOTE="cloudflare-r2"
CDN_URL="flybywirecdn.com"
FILES=${1}
R2_BUCKET="flybywiresim"
CDN_DIR=${2:-"addons/a32nx/test"}
CDN_DIR=${2:-"addons/simulator/addon/test"}

echo "Syncing files from: ${FILES}/*"
echo "Syncing to: $RCLONE_REMOTE:$CDN_DIR"
Expand Down
Loading