Skip to content

Commit

Permalink
Kernel 6.6.20 (#103)
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 authored Mar 12, 2024
1 parent ca73322 commit 363920e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
jobs:

build:

runs-on: ubuntu-22.04

strategy:
matrix:
kernel: ["6.6.16"]
kernel: ["6.6.20"]

steps:
- name: Checkout
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
prerelease: false

- name: Upload Release Asset
id: upload-release-asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
21 changes: 9 additions & 12 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@ env:
jobs:
build:
runs-on: ubuntu-22.04

strategy:
matrix:
kernel: ["6.6.16"]
kernel: ["6.6.20"]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Figure out if running fork PR
id: fork
run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"'
- uses: google-github-actions/auth@v2
with:
credentials_json: '${{ secrets.GCP_SA_KEY }}'

- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v2

- name: Build project # This would actually build your project, using zip for an example artifact
run: |
Expand All @@ -33,11 +36,5 @@ jobs:
tar -xf kernel.tar metal-kernel
cp metal-kernel metal-kernel-${{ matrix.kernel }}-pr-${GITHUB_HEAD_REF##*/}
- uses: google-github-actions/setup-gcloud@v0
with:
service_account_email: ${{ secrets.GCP_SA_EMAIL }}
service_account_key: ${{ secrets.GCP_SA_KEY }}

- name: Upload kernel to GCS
run: gsutil -m cp -r metal-kernel gs://$GCS_BUCKET/metal-kernel/pull_requests/metal-kernel-${{ matrix.kernel }}
if: steps.fork.outputs.is_fork_pr == 'false'
run: gsutil -m -h "Cache-Control:no-store" cp -r metal-kernel gs://$GCS_BUCKET/metal-kernel/pull_requests/metal-kernel-${{ matrix.kernel }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.ONESHELL:
KERNEL_VERSION := $(or ${KERNEL_VERSION},6.6.16)
KERNEL_VERSION := $(or ${KERNEL_VERSION},6.6.20)

.PHONY: all
all: build
Expand Down
10 changes: 5 additions & 5 deletions config-mainline-x86_64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.6.1 Kernel Configuration
# Linux/x86 6.6.18 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 13.2.0-4ubuntu3) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand All @@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_TOOLS_SUPPORT_RELR=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
Expand Down Expand Up @@ -313,7 +314,7 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
# Processor type and features
#
CONFIG_SMP=y
# CONFIG_X86_X2APIC is not set
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
# CONFIG_X86_CPU_RESCTRL is not set
Expand All @@ -329,6 +330,7 @@ CONFIG_HYPERVISOR_GUEST=y
CONFIG_PVH=y
# CONFIG_JAILHOUSE_GUEST is not set
# CONFIG_ACRN_GUEST is not set
# CONFIG_INTEL_TDX_GUEST is not set
# CONFIG_MK8 is not set
# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
Expand Down Expand Up @@ -419,6 +421,7 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_X86_INTEL_TSX_MODE_OFF=y
# CONFIG_X86_INTEL_TSX_MODE_ON is not set
# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
# CONFIG_X86_SGX is not set
# CONFIG_X86_USER_SHADOW_STACK is not set
CONFIG_EFI=y
CONFIG_EFI_STUB=y
Expand Down Expand Up @@ -2771,7 +2774,6 @@ CONFIG_LPC_SCH=y
CONFIG_MFD_SM501=y
# CONFIG_MFD_SKY81452 is not set
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TI_AM335X_TSCADC is not set
# CONFIG_MFD_LP3943 is not set
# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_TI_LMU is not set
Expand Down Expand Up @@ -4355,8 +4357,6 @@ CONFIG_DEBUG_LIST=y
# CONFIG_DEBUG_MAPLE_TREE is not set
# end of Debug kernel data structures

# CONFIG_DEBUG_CREDENTIALS is not set

#
# RCU Debugging
#
Expand Down

0 comments on commit 363920e

Please sign in to comment.