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.

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

Repo File Sync: 202311 Branch Transition Updates #724

Merged
merged 1 commit into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/release-draft-config-n-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'

commitish: refs/heads/release/202208
commitish: refs/heads/release/202302
filter-by-commitish: true

template: |
Expand Down
2 changes: 1 addition & 1 deletion .github/release-draft-config-n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'

commitish: refs/heads/release/202302
commitish: refs/heads/release/202311
filter-by-commitish: true

template: |
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ jobs:

# Find the plugin directory that contains the CodeQL plugin
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('BaseTools/Plugin/CodeQL'))
if not plugin_dir:
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL'))

# This should only be found once
if len(plugin_dir) == 1:
Expand Down Expand Up @@ -327,17 +329,18 @@ jobs:
import sys
from pathlib import Path

# Find the plugin directory that contains the CodeQL plugin
# Find the plugin directory that contains the Compiler plugin
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CompilerPlugin'))

# This should only be found once
if len(plugin_dir) == 1:
# If the directory is found get the parent Plugin directory
plugin_dir = str(plugin_dir[0].parent)

with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
print(f'pytool_plugin_dir={plugin_dir}', file=fh)
else:
print("::error title=Workspace Error!::Failed to find Mu Basecore pytool plugin directory!")
print("::error title=Workspace Error!::Failed to find Mu Basecore .pytool/Plugin directory!")
sys.exit(1)

- name: Remove CI Plugins Irrelevant to CodeQL
Expand All @@ -349,8 +352,8 @@ jobs:
import shutil
from pathlib import Path

# Only this plugin is needed for CodeQL
plugins_to_keep = ['CompilerPlugin']
# Only these two plugins are needed for CodeQL
plugins_to_keep = ['CodeQL', 'CompilerPlugin']

plugin_dir = Path(os.environ['PYTOOL_PLUGIN_DIR']).absolute()
if plugin_dir.is_dir():
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name: Update Release Draft
on:
push:
branches:
- release/202302
- release/202311

jobs:
draft:
Expand Down
Loading