Skip to content
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

More CI Fixes #1903

Merged
merged 3 commits into from
Aug 23, 2024
Merged

More CI Fixes #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a8287b
Fix stray usages of ReleaseNotes app token generation
Cyberboss Aug 22, 2024
d1743d5
Fix code scanning
Cyberboss Aug 22, 2024
71b91b2
Mark .deb service testing as flaky
Cyberboss Aug 22, 2024
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
20 changes: 7 additions & 13 deletions .github/workflows/ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ jobs:
runs-on: ubuntu-latest
permissions:
security-events: write
actions: read
env:
TGS_TELEMETRY_KEY_FILE: /tmp/tgs_telemetry_key.txt
steps:
Expand All @@ -92,6 +91,13 @@ jobs:

- name: Checkout (Branch)
uses: actions/checkout@v4
if: github.event_name == 'push' || github.event_name == 'schedule'

- name: Checkout (PR Merge)
uses: actions/checkout@v4
if: github.event_name != 'push' && github.event_name != 'schedule'
with:
ref: "refs/pull/${{ inputs.pull_request_number }}/merge"

- name: Read Current SHA
id: get-pr-sha
Expand Down Expand Up @@ -2068,12 +2074,6 @@ jobs:
if: (!(cancelled() || failure())) && needs.deploy-tgs.result == 'success'
needs: deploy-tgs
steps:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}

- name: gh-pages Clone
run: git clone -b gh-pages --single-branch "https://[email protected]/tgstation/tgstation-server" $HOME/tgsdox

Expand All @@ -2097,12 +2097,6 @@ jobs:
mv $HOME/tgsdox/changelog.yml ./ 2>/dev/null
dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --generate-full-notes

- name: Generate App Token
run: |
dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --token-output-file ${{ runner.temp }}/installation_secret.txt ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
echo "INSTALLATION_TOKEN=$(cat ${{ runner.temp }}/installation_secret.txt)" >> $GITHUB_ENV
rm ${{ runner.temp }}/installation_secret.txt

- name: gh-pages Push
run: |
pushd $HOME/tgsdox
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/scripts/rerunFlakyTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const CONSIDERED_STEP_PREFIXES = [
"Build", // Nuget.org sporadic issues
"Install Native", // apt repository issues
"Test Service", // systemd bollocks
];

// Otherwise only check jobs that start with these.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stable-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ jobs:
allow_forks: true
user_name: tgstation-server-ci[bot]
user_email: 161980869+tgstation-server-ci[bot]@users.noreply.github.com
push_token: INSTALLATION_TOKEN
push_token: ${{ steps.app-token-generation.outputs.token }}
env:
GITHUB_TOKEN: ${{ steps.app-token-generation.outputs.token }}
11 changes: 0 additions & 11 deletions .github/workflows/update-ss13-org-mirror.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,6 @@ jobs:
fetch-tags: true
token: ${{ steps.app-token-generation.outputs.token }}

- name: Build ReleaseNotes
run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj

- name: Generate App Token
run: |
dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --token-output-file ${{ runner.temp }}/installation_secret.txt ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
echo "INSTALLATION_TOKEN=$(cat ${{ runner.temp }}/installation_secret.txt)" >> $GITHUB_ENV
rm ${{ runner.temp }}/installation_secret.txt
env:
TGS_RELEASE_NOTES_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}

- name: Push to Spacestation13 Fork
run: |
git config user.name "tgstation-server-ci[bot]"
Expand Down
Loading