Skip to content

Commit

Permalink
Merge branch 'main' into NPG-7753-ideascale-importer-throws-an-except…
Browse files Browse the repository at this point in the history
…ion-when-the-campain-is-missing-the-tagline
  • Loading branch information
minikin authored Jul 26, 2023
2 parents 78018b1 + a526e59 commit dc2d9b1
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Please also list any relevant details for your test configuration
- Toolchain:
- SDK:

**List of new dependecies**: _if applicable_
**List of new dependencies**: _if applicable_

Provide a list of newly added dependencies in this PR, with the description of what are they doing and why do we need them.

Expand Down
45 changes: 26 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ name: Build
on:
push:
branches:
- main
- main
paths-ignore:
- '**.md'
- 'src/**/**.md'
- 'Makefiles/**'
- 'nix/**'
- 'book/**'
- "**.md"
- "src/**/**.md"
- "Makefiles/**"
- "nix/**"
- "book/**"
pull_request:
branches:
- main
- main
paths-ignore:
- '**.md'
- 'book/**'
- 'src/**/**.md'
- 'Makefiles/**'
- 'nix/**'
- 'book/**'
- "**.md"
- "book/**"
- "src/**/**.md"
- "Makefiles/**"
- "nix/**"
- "book/**"

env:
RUST_LATEST_STABLE_VERSION: 1.65
Expand All @@ -30,10 +30,9 @@ env:
CARGO_FLAGS: --verbose --locked
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 15


jobs:
cancel:
name: 'Cancel Previous Runs'
name: "Cancel Previous Runs"
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
Expand Down Expand Up @@ -62,8 +61,17 @@ jobs:
save-if: ${{ github.ref == 'refs/heads/main' }}

- name: Install deps
run:
sudo apt install -y protobuf-compiler libssl-dev libpq-dev libsqlite3-dev pkg-config
run: sudo apt install -y protobuf-compiler libssl-dev libpq-dev libsqlite3-dev pkg-config

- name: Free disk space
# https://github.com/actions/virtual-environments/issues/709
run: |
sudo apt-get clean
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
df -h
- name: Build on Linux
run: cargo build --all-features ${{env.CARGO_FLAGS}}
Expand Down Expand Up @@ -109,8 +117,7 @@ jobs:

- name: Install dependencies
working-directory: "C:\\${{ github.event.repository.name }}"
run:
choco install -y protoc openssl sqlite postgresql14
run: choco install -y protoc openssl sqlite postgresql14

- name: Set PostgreSQL env variables
working-directory: "C:\\${{ github.event.repository.name }}"
Expand Down

0 comments on commit dc2d9b1

Please sign in to comment.