Skip to content

Commit 0a58e51

Browse files
committed
Revert "update simulator"
This reverts commit dff555d.
1 parent dff555d commit 0a58e51

File tree

3 files changed

+25
-64
lines changed

3 files changed

+25
-64
lines changed

.github/workflows/process_docs_changes.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,11 @@ jobs:
114114

115115
- name: Merge control files from Marketing Repo
116116
run: |
117-
bb script/sync-repo.clj --from .marketing_repo
117+
cp -r .marketing_repo/_data .
118+
cp -r .marketing_repo/_includes .
119+
cp -r .marketing_repo/_layouts .
120+
cp -r .marketing_repo/_plugins .
121+
cp -r .marketing_repo/_sass .
118122
119123
- name: "yarn lint-markdown"
120124
run: |

script/_test/simulator.sh

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,42 @@
99

1010
set -euo pipefail
1111

12-
echo "Prerequisites"
13-
echo ""
14-
echo "Installed:"
15-
echo " - Ruby (>= 2.7.0)"
16-
echo " - Jekyll (>= 3.8.5)"
17-
echo " - Bundler (>= 2.0.1)"
18-
echo " - Node.js (>= 12.0.0)"
19-
echo " - Yarn (>= 1.22.0)"
20-
echo " - Babashka"
21-
echo ""
22-
echo "Directory Structure:"
23-
echo " - metabase.github.io (the marketing repo) should be at ../metabase.github.io relative to the root of this repo"
24-
echo ""
25-
echo "Running simulator.sh on branch: $TARGET_BRANCH"
26-
27-
printf '\n\n\n================= bb script/_test/all.clj =================z\n'
12+
echo "Running simulator.sh on branch: $MAIN_REPO_BRANCH"
13+
14+
printf '\n\n\n============================== bb script/_test/all.clj ==============================z\n'
2815
bb script/_test/all.clj
2916

30-
printf "\n\n\n================= bb script/check_incoming_branchname.clj --target-branch %s =================z\n" "$TARGET_BRANCH"
31-
bb script/check_incoming_branchname.clj --target-branch "$TARGET_BRANCH"
17+
printf '\n\n\n============================== bb script/check_incoming_branchname.clj "$MAIN_REPO_BRANCH" ==============================z\n'
18+
bb script/check_incoming_branchname.clj "$MAIN_REPO_BRANCH"
19+
20+
printf '\n\n\n============================== bb script/update_docs_for_branchname.clj "$MAIN_REPO_BRANCH" ==============================z\n'
21+
bb script/update_docs_for_branchname.clj "$MAIN_REPO_BRANCH"
3222

33-
printf "\n\n\n================= bb script/update_docs_for_branchname.clj --source-branch %s --target-branch %s =================z\n" "$SOURCE_BRANCH" "$TARGET_BRANCH"
34-
bb script/update_docs_for_branchname.clj --source-branch "$SOURCE_BRANCH" --target-branch "$TARGET_BRANCH"
23+
printf '\n\n\n============================== copy marketing files ==============================z\n'
3524

36-
printf '\n\n\n================= copy marketing files =================z\n'
37-
bb script/sync_repo.clj --from-repo ../metabase.github.io
25+
cp -r ../metabase.github.io/_data .
26+
cp -r ../metabase.github.io/_includes .
27+
cp -r ../metabase.github.io/_community-posts .
28+
cp -r ../metabase.github.io/_layouts .
29+
cp -r ../metabase.github.io/_plugins .
30+
cp -r ../metabase.github.io/_sass .
3831

39-
printf '\n\n\n================= yarn lint-markdown =================z\n'
32+
printf '\n\n\n============================== yarn lint-markdown ==============================z\n'
4033
yarn lint-markdown
4134

42-
printf '\n\n\n================= yarn lint-styles =================z\n'
35+
printf '\n\n\n============================== yarn lint-styles ==============================z\n'
4336
yarn lint-styles
4437

45-
printf '\n\n\n================= yarn lint-scripts =================z\n'
38+
printf '\n\n\n============================== yarn lint-scripts ==============================z\n'
4639
yarn lint-scripts
4740

48-
printf '\n\n\n================= yarn lint-links =================z\n'
41+
printf '\n\n\n============================== yarn lint-links ==============================z\n'
4942
yarn lint-links
5043

5144
# Clear the existing site:
5245
rm -rf _site
5346

54-
# Build the docs jekyll site:
47+
# Build the jekyll site:
5548
bundle exec jekyll build
5649

5750
script/links || true

script/sync_repo.clj

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)