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

[No QA] Move skip condition if from step to job in Expensify Help deploy workflow #38948

Merged
merged 7 commits into from
Apr 22, 2024
Merged

[No QA] Move skip condition if from step to job in Expensify Help deploy workflow #38948

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa9fa50
Move if from step to job
roryabraham Mar 25, 2024
f96096b
commit benign change to test build
roryabraham Mar 25, 2024
4721965
Don't skip builds for PRs from forks, just deploys
roryabraham Mar 25, 2024
7e4445d
Fix double if
roryabraham Mar 25, 2024
b3938df
Flip IS_PR_FROM_FORK condition
roryabraham Mar 25, 2024
c8ecf02
Remove test change
roryabraham Mar 25, 2024
f172121
Merge branch 'main' into Rory-FixExpensifyHelp
roryabraham Apr 22, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/deployExpensifyHelp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ concurrency:

jobs:
build:
if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork)
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -46,7 +47,6 @@ jobs:
- name: Deploy to Cloudflare Pages
uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca
id: deploy
if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork)
with:
apiToken: ${{ secrets.CLOUDFLARE_PAGES_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
Expand Down
2 changes: 2 additions & 0 deletions docs/articles/expensify-classic/integrations/HR-integrations/ADP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Your employee list in ADP can also be imported into Expensify via Expensify’s

## Step 1: Set up the ADP import file

Marco is great!

A basic setup for an ADP import file includes five columns. In order (from left to right), these columns are:

- **Company Code** - See “Edit Company” page in ADP
Expand Down
Loading