Skip to content

Commit

Permalink
Move code pulls earlier
Browse files Browse the repository at this point in the history
Run-GHA: true

Required-githooks: true

Signed-off-by: Margaret Lawson <[email protected]>
  • Loading branch information
mlawsonca committed Dec 3, 2024
1 parent a304775 commit 3cd28c7
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 2,008 deletions.
24 changes: 24 additions & 0 deletions .github/actions/import-commit-message/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# it's a real shame that this step is even needed. push events have the commit message # in
# ${{ github.event.head_commit.message }} but pull_requests don't. :-(
name: 'Import Commit Message'
description: 'Import Commit Message'
runs:
using: "composite"
steps:
- name: Import Commit Message
id: commit_message
shell: bash
run: echo "text<<EOF" >> $GITHUB_OUTPUT;
git show -s --format=%B >> $GITHUB_OUTPUT;
echo "EOF" >> $GITHUB_OUTPUT;
- name: Import and Dequote Commit Message
id: dequoted_commit_message
shell: bash
run: . ci/gha_functions.sh;
echo "text<<EOF" >> $GITHUB_OUTPUT;
git show -s --format=%B | escape_single_quotes >> $GITHUB_OUTPUT;
echo "EOF" >> $GITHUB_OUTPUT;
- name: Identify Commit Pragmas
shell: bash
run: . ci/gha_functions.sh;
echo '${{ steps.dequoted_commit_message.outputs.text }}' | get_commit_pragmas
32 changes: 0 additions & 32 deletions .github/workflows/bash_unit_testing.yml

This file was deleted.

152 changes: 0 additions & 152 deletions .github/workflows/ci2.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/create_release.yml

This file was deleted.

25 changes: 17 additions & 8 deletions .github/workflows/gcp-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,20 @@ jobs:
env:
DISTRO_NAME:
DISTRO_VERSION:
LIBFABRIC_HASH:
MERCURY_HASH:
ISA-L_HASH:
ISA-L_CRYPTO_HASH:
ARGOBOTS_HASH:
DPDK_HASH:
SPDK_HASH:
RAFT_HASH:
PMDK_HASH:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Import commit pragmas
uses: ./.github/actions/import-commit-pragmas
- name: Set PR repo env vars
Expand Down Expand Up @@ -175,10 +188,6 @@ jobs:
echo "DISTRO_NAME=$DISTRO_NAME" >> $GITHUB_ENV
echo "DISTRO_VERSION=$DISTRO_VERSION" >> $GITHUB_ENV
echo "STAGE_NAME=Build RPM on $DISTRO_NAME $DISTRO_VERSION" >> $GITHUB_ENV
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Remove Dockerignore file
# necessary because our Dockerfile assumes /daos is our build context
# but the .dockerignore file ignores many files we need in our RPM
Expand Down Expand Up @@ -225,6 +234,10 @@ jobs:
DISTRO_NAME:
DISTRO_VERSION:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Import commit pragmas
uses: ./.github/actions/import-commit-pragmas
- name: Set variables
Expand All @@ -246,10 +259,6 @@ jobs:
echo "BASE_DOCKER_IMAGE=$BASE_DOCKER_IMAGE" >> $GITHUB_ENV
echo "DAOS_DOCKER_IMAGE=$DAOS_DOCKER_IMAGE" >> $GITHUB_ENV
echo "STAGE_NAME=Build Server Images" >> $GITHUB_ENV
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Remove Dockerignore file
# necessary because our Dockerfile assumes /daos is our build context
# but the .dockerignore file ignores many files we need in our RPM
Expand Down
Loading

0 comments on commit 3cd28c7

Please sign in to comment.