Skip to content

Commit

Permalink
Merge pull request #7581 from unfoldingWord/mcleanb-7580-fix-parsing-…
Browse files Browse the repository at this point in the history
…resources-with-missing-file

Fix parsing resources with missing files
  • Loading branch information
PhotoNomad0 authored Jul 12, 2024
2 parents 4dc6b21 + 4400964 commit de28495
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Build commands
# Build commands (run docker on x64 machine or emulated x64):
# sudo docker login -u <dockerhub-user>
# sudo docker build -t github_build .
# sudo docker tag github_build <dockerhub-user>/github_build:latest
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
trim: [ 0, 1 ]
needs: test
runs-on: ubuntu-latest
container: neutrinog/concourse-tasks:latest
container: photonomad/github_build:latest
env:
TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }}
TC_HELP_DESK_EMAIL: ${{ secrets.TC_HELP_DESK_EMAIL }}
Expand All @@ -137,15 +137,21 @@ jobs:
steps:
- uses: actions/setup-node@v1
with:
node-version: '16.4.2'
node-version: '16.14.2'

- name: TRIM setting
run: echo "Trim value is $TRIM"

- name: Node version
- name: Get version
run: |
echo "node --version"
node --version
echo "npm --version"
npm --version
echo "git --version"
git --version
echo "pwd"
pwd
# - uses: actions/checkout@v2
# - name: Checkout submodules
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
"string-punctuation-tokenizer": "^2.2.0",
"sudo-prompt": "6.2.1",
"tc-electron-env": "0.10.0",
"tc-source-content-updater": "1.4.24",
"tc-source-content-updater": "1.4.25",
"tc-strings": "0.1.7",
"tc-tool": "4.1.0",
"tc-ui-toolkit": "6.2.9",
Expand Down

0 comments on commit de28495

Please sign in to comment.