diff --git a/.antora/antora.yml b/.antora/antora.yml index e091a6471..009e10a9d 100644 --- a/.antora/antora.yml +++ b/.antora/antora.yml @@ -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 diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml new file mode 100644 index 000000000..e5632fa1c --- /dev/null +++ b/.github/workflows/antora-generator.yml @@ -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 }}"}' + \ No newline at end of file diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index a7acae918..c719a68ce 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -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 @@ -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' @@ -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 @@ -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'