Skip to content

Commit

Permalink
Rename primary branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
ffried committed Sep 17, 2023
1 parent aed31e7 commit 7310ab8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: CodeQL

on:
push:
branches: [ master ]
branches: [ main ]
paths-ignore: [ 'dist/*.js' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]
schedule:
- cron: '15 11 * * 1'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy Action Code

on:
push:
branches: [ master ]
branches: [ main ]
paths-ignore: [ 'dist/*.js' ]

jobs:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Tests

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'dist/*.js'
- '.github/workflows/tests.yml'
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
test-release:
Expand All @@ -25,9 +25,9 @@ jobs:
- name: Generate action code
if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/actions/generate-action-code
- uses: sersoft-gmbh/swifty-linux-action@master
- uses: sersoft-gmbh/swifty-linux-action@main
if: ${{ github.event_name == 'push' }}
id: install-swift-master
id: install-swift-main
with:
release-version: ${{ matrix.swift-version }}
platform: ${{ matrix.os-version }}
Expand All @@ -42,7 +42,7 @@ jobs:
- id: install-swift
env:
EVENT_NAME: ${{ github.event_name }}
BRANCH_INSTALL_PATH: ${{ steps.install-swift-master.outputs.install-path }}
BRANCH_INSTALL_PATH: ${{ steps.install-swift-main.outputs.install-path }}
LOCAL_INSTALL_PATH: ${{ steps.install-swift-local.outputs.install-path }}
run: |
if [ "${EVENT_NAME}" == 'push' ]; then
Expand Down Expand Up @@ -74,9 +74,9 @@ jobs:
- name: Generate action code
if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/actions/generate-action-code
- uses: sersoft-gmbh/swifty-linux-action@master
- uses: sersoft-gmbh/swifty-linux-action@main
if: ${{ github.event_name == 'push' }}
id: install-swift-master
id: install-swift-main
with:
branch-name: swift-${{ matrix.swift-version }}-release
version-tag: swift-${{ matrix.swift-version }}-RELEASE
Expand All @@ -91,7 +91,7 @@ jobs:
- id: install-swift
env:
EVENT_NAME: ${{ github.event_name }}
BRANCH_INSTALL_PATH: ${{ steps.install-swift-master.outputs.install-path }}
BRANCH_INSTALL_PATH: ${{ steps.install-swift-main.outputs.install-path }}
LOCAL_INSTALL_PATH: ${{ steps.install-swift-local.outputs.install-path }}
run: |
if [ "${EVENT_NAME}" == 'push' ]; then
Expand Down Expand Up @@ -121,9 +121,9 @@ jobs:
- name: Generate action code
if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/actions/generate-action-code
- uses: sersoft-gmbh/swifty-linux-action@master
- uses: sersoft-gmbh/swifty-linux-action@main
if: ${{ github.event_name == 'push' }}
id: install-swift-master
id: install-swift-main
with:
release-version: ${{ env.INPUT_SWIFT_VERSION }}
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -136,7 +136,7 @@ jobs:
- id: install-swift
env:
EVENT_NAME: ${{ github.event_name }}
BRANCH_INSTALL_PATH: ${{ steps.install-swift-master.outputs.install-path }}
BRANCH_INSTALL_PATH: ${{ steps.install-swift-main.outputs.install-path }}
LOCAL_INSTALL_PATH: ${{ steps.install-swift-local.outputs.install-path }}
run: |
if [ "${EVENT_NAME}" == 'push' ]; then
Expand Down

0 comments on commit 7310ab8

Please sign in to comment.