swisskyrepo
/
ashirt
mirror of https://github.com/swisskyrepo/ashirt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating branch terminology in ci (#110) 

Co-authored-by: John Kennedy <jkennedy@verizonmedia.com>
main
jkennedyvz 2022-02-24 14:38:16 -08:00 committed by GitHub
parent ede39372f4
commit c06edcf9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/ci.yaml vendored
View File

@ -2,11 +2,11 @@ name: ci
on: on:
push: push:
branches: [ master, release-* ] branches: [ main, release-* ]
tags: tags:
'v*' 'v*'
pull_request: pull_request:
branches: [ master ] branches: [ main ]
jobs: jobs:
# This is a super hacky way to get this into a place that can actually be # This is a super hacky way to get this into a place that can actually be
@ -56,7 +56,7 @@ jobs:
cached: ${{ steps.cache-qt.outputs.cache-hit }} cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Build Pr (Linux) - name: Build Pr (Linux)
if: matrix.os == 'ubuntu-16.04' && !contains(github.ref, 'tags/v') && !contains(github.ref, 'refs/heads/master') && !contains(github.ref, 'refs/heads/release-') if: matrix.os == 'ubuntu-16.04' && !contains(github.ref, 'tags/v') && !contains(github.ref, 'refs/heads/main') && !contains(github.ref, 'refs/heads/release-')
run: | run: |
echo "Building!" echo "Building!"
sudo apt install libxcb-keysyms1-dev desktop-file-utils libxcb-icccm4 libxcb-image0 libxcb-util1 \ sudo apt install libxcb-keysyms1-dev desktop-file-utils libxcb-icccm4 libxcb-image0 libxcb-util1 \
@ -81,7 +81,7 @@ jobs:
if: | if: |
matrix.os == 'macos-latest' && matrix.os == 'macos-latest' &&
contains(github.ref, 'tags/v') != true && contains(github.ref, 'tags/v') != true &&
contains(github.ref, 'refs/heads/master') != true && contains(github.ref, 'refs/heads/main') != true &&
contains(github.ref, 'refs/heads/release') != true contains(github.ref, 'refs/heads/release') != true
run: | run: |
brew install qt@5 brew install qt@5
@ -98,7 +98,7 @@ jobs:
- name: Import Code-Signing Certificates - name: Import Code-Signing Certificates
if: | if: |
matrix.os == 'macos-latest' && matrix.os == 'macos-latest' &&
(contains(github.ref, 'tags/v') || github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release')) (contains(github.ref, 'tags/v') || github.ref == 'refs/heads/main' || contains(github.ref, 'refs/heads/release'))
uses: Apple-Actions/import-codesign-certs@v1.0.4 uses: Apple-Actions/import-codesign-certs@v1.0.4
with: with:
p12-file-base64: ${{ secrets.MACOS_CERT }} p12-file-base64: ${{ secrets.MACOS_CERT }}
@ -107,7 +107,7 @@ jobs:
- name: Build and Sign Release (mac) - name: Build and Sign Release (mac)
if: | if: |
matrix.os == 'macos-latest' && matrix.os == 'macos-latest' &&
(contains(github.ref, 'tags/v') || github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release')) (contains(github.ref, 'tags/v') || github.ref == 'refs/heads/main' || contains(github.ref, 'refs/heads/release'))
run: | run: |
brew install qt@5 brew install qt@5
export PATH="/usr/local/opt/qt@5/bin:$PATH" export PATH="/usr/local/opt/qt@5/bin:$PATH"
@ -123,7 +123,7 @@ jobs:
- name: Install gon via HomeBrew and Notarize (mac) - name: Install gon via HomeBrew and Notarize (mac)
if: | if: |
matrix.os == 'macos-latest' && matrix.os == 'macos-latest' &&
(contains(github.ref, 'tags/v') || github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release')) (contains(github.ref, 'tags/v') || github.ref == 'refs/heads/main' || contains(github.ref, 'refs/heads/release'))
env: env:
GON_CONF: ${{ secrets.GON_CONF }} GON_CONF: ${{ secrets.GON_CONF }}
run: | run: |