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

Build/master branch naming #672

Merged
merged 8 commits into from
Nov 7, 2022
Merged

Build/master branch naming #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfea45b
Changed version naming for master branch
philipwindecker Oct 14, 2022
03e1100
build: Updated ubuntu image
philipwindecker Oct 14, 2022
cf83918
Added new antora generator trigger
philipwindecker Oct 17, 2022
cedc04c
Removed test branch from "on" keyword
philipwindecker Oct 17, 2022
d94a2e9
Removed broken references to deleted submodules
philipwindecker Oct 17, 2022
9ba6144
Update of pipeline cache action and key to
philipwindecker Oct 17, 2022
eec8ccd
Fixed outdated cache dependency for protobuf 3
philipwindecker Oct 17, 2022
567b122
Added additional information to pipeline trigger
philipwindecker Oct 17, 2022
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
1 change: 1 addition & 0 deletions .antora/antora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: asamosi
version:
# Update version number accordingly. This is the version for the main branch
main: 'current'
master: 'current'
v(*)-antora: V$1
v(*): V$1
V(*): V$1
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/antora-generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

name: Antora build trigger

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
trigger_antora:
name: Trigger antora generator

runs-on: Ubuntu-latest

steps:
- name: Trigger generator
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.MACHINE_USER_PAT }}
event-type: antora-build-trigger
repository: OpenSimulationInterface/osi-antora-generator
client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "head_ref": "${{ github.head_ref }}"}'

10 changes: 5 additions & 5 deletions .github/workflows/protobuf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-proto2-linux64:
name: Build Proto2 Linux 64

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- name: Checkout OSI
Expand All @@ -30,10 +30,10 @@ jobs:

- name: Cache Dependencies
id: cache-depends
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: protobuf-3.20.1
key: ${{ runner.os }}-v1-depends
key: ${{ runner.os }}-v2-depends

- name: Download ProtoBuf
if: steps.cache-depends.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
build-proto3-linux64:
name: Build Proto3 Linux 64

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- name: Checkout OSI
Expand All @@ -121,7 +121,7 @@ jobs:
uses: actions/cache@v2
with:
path: protobuf-3.20.1
key: ${{ runner.os }}-v1-depends
key: ${{ runner.os }}-v2-depends

- name: Download ProtoBuf
if: steps.cache-depends.outputs.cache-hit != 'true'
Expand Down