8000 Merge pull request #7534 from circleci/DD-824-remove-unused-code · marcoderama/circleci-docs@359dfb2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 359dfb2

Browse files
halie-kastlhalie-kastl
authored
Merge pull request circleci#7534 from circleci/DD-824-remove-unused-code
[DD-824] Tooling and Javascript files removed
2 parents afe3e8e + 5810038 commit 359dfb2
  • jest
  • jest.config.js
  • package.json
  • scripts
  • src
  • webpack.config.js
  • yarn-error.log
  • yarn.lock

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    118 files changed

    +9620
    -20222
    lines changed

    ‎.babelrc

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

    ‎.circleci/config.yml

    Lines changed: 2 additions & 101 deletions
    179B
    Original file line numberDiff line numberDiff line change
    @@ -93,15 +93,13 @@ workflows:
    9393
    when:
    9494
    not: << pipeline.parameters.run-schedule >>
    9595
    jobs:
    96-
    - js_build
    9796
    - build_server_pdfs:
    9897
    filters:
    9998
    branches:
    10099
    only: /.*/server/*
    101100
    - build_api_docs
    102101
    - build:
    103102
    requires:
    104-
    - js_build
    105103
    - build_server_pdfs
    106104
    - build_api_docs
    107105
    - minimize-images:
    @@ -122,11 +120,7 @@ workflows:
    122120
    filters:
    123121
    branches:
    124122
    only: master
    125-
    - datadog-synthetics:
    126-
    context:
    127-
    - web-ui-datadog
    128-
    requires:
    129-
    - deploy
    123+
    130124

    131125
    # We run a nightly build to refresh content and build docs-platform
    132126
    # at least once every day. Triggered every day at 08:00 AM on master branch
    @@ -136,65 +130,6 @@ workflows:
    136130
    - trigger-deploy
    137131

    138132
    jobs:
    139-
    js_build: # this job is responsible for building Javascript assets and making them available for the "build" job
    140-
    executor: # we specify our executor to use the node orb.
    141-
    name: node/default
    142-
    tag: '14.17.3'
    143-
    steps:
    144-
    - *attach_workspace
    145-
    - checkout # get the code from GitHub
    146-
    - node/install-packages:
    147-
    pkg-manager: yarn
    148-
    cache-version: &npm-cache-version v1 # Gets cache version from project environment variable (E.g v1)
    149-
    - set-jekyll-basename
    150-
    - run:
    151-
    name: "Lint JS assets"
    152-
    command: yarn lint
    153-
    - run:
    154-
    name: "Run tests"
    155-
    command: yarn test:ci
    156-
    - run:
    157-
    name: "Prepare JS assets" # Compile our final, production-ready JavaScript.
    158-
    command: yarn webpack-prod
    159-
    - run:
    160-
    name: "Persist JS assets" # Move our JS+CSS into our workspace.
    161-
    command: |
    162-
    set -exu
    163-
    mkdir -p /tmp/workspace/js
    164-
    mkdir -p /tmp/workspace/css
    165-
    mv jekyll/assets/js/* /tmp/workspace/js/
    166-
    mv jekyll/assets/css/* /tmp/workspace/css/
    167-
    - run:
    168-
    name: "Persist package.json" # Move our package.json into our workspace for datadog synthetic tests.
    169-
    command:
    170-
    mv package.json /tmp/workspace/package.json
    171-
    - run:
    172-
    name: "Persist yarn.lock" # Move our yarn.lock into our workspace for datadog synthetic tests.
    173-
    command:
    174-
    mv yarn.lock /tmp/workspace/yarn.lock
    175-
    - run:
    176-
    name: "Persist .datadog" # Move our .datadog into our workspace for datadog synthetic tests.
    177-
    command: |
    178-
    set -exu
    179-
    mkdir -p /tmp/workspace/.datadog
    180-
    mv .datadog/*.synthetics.json /tmp/workspace/.datadog/
    181-
    - run:
    182-
    name: "Persist postinstall script" # Move our relevant shell scripts into our workspace for datadog synthetic tests.
    183-
    command: |
    184-
    set -exu
    185-
    mkdir -p /tmp/workspace/scripts
    186-
    mv scripts/datadog-synthetics-preview.js /tmp/workspace/scripts/datadog-synthetics-preview.js
    187-
    mv scripts/postinstall.sh /tmp/workspace/scripts/postinstall.sh
    188-
    mv scripts/process-images.sh /tmp/workspace/scripts/process-images.sh
    189-
    - persist_to_workspace: # store the built files into the workspace for other jobs.
    190-
    root: *workspace_root
    191-
    paths:
    192-
    - js
    193-
    - css
    194-
    - package.json
    195-
    - yarn.lock
    196-
    - .datadog
    197-
    - scripts
    198133

    199134
    build_server_pdfs: # this job builds server-related pdf documentation, persisting it to the workspace as well.
    200135
    docker:
    @@ -272,7 +207,7 @@ jobs:
    272207
    - ruby-deps
    273208
    - node/install-packages:
    274209
    pkg-manager: yarn
    275-
    cache-version: *npm-cache-version # Gets cache version from project environment variable (E.g v1)
    210+
    cache-version: &npm-cache-version # Gets cache version from project environment variable (E.g v1)
    276211
    - run:
    277212
    name: Run markdownlint with pronto
    278213
    command: bundle exec pronto run -f github_pr -c origin/master
    @@ -286,10 +221,6 @@ jobs:
    286221
    name: Restore Previous Job Assets (Javascript, API docs) to Jekyll directory.
    287222
    command: |
    288223
    set -exu
    289-
    mkdir -p /tmp/workspace/js
    290-
    mkdir -p /tmp/workspace/css
    291-
    mv -fn /tmp/workspace/js/* jekyll/assets/js/
    292-
    mv -fn /tmp/workspace/css/* jekyll/assets/css/
    293224
    mkdir -p /tmp/workspace/api
    294225
    cp -r /tmp/workspace/api/ jekyll/_api/
    295226
    # remove unusued /api folder.
    @@ -349,21 +280,6 @@ jobs:
    349280
    command: |
    350281
    ALGOLIA_API_KEY=$ALGOLIA_PRIVATE_KEY bundle exec jekyll algolia --source jekyll --config jekyll/_config.yml
    351282
    352-
    datadog-synthetics-preview:
    353-
    executor:
    354-
    name: node/default
    355-
    tag: '14.17.3'
    356-
    description: Use Datadog CLI to run synthetic tests on preview S3
    357-
    working_directory: *workspace_root
    358-
    steps:
    359-
    - *attach_workspace
    360-
    - node/install-packages:
    361-
    pkg-manager: yarn
    362-
    cache-version: &npm-cache-version v1 # Gets cache version from project environment variable (E.g v1)
    363-
    - run:
    364-
    name: Call Datadog CLI
    365-
    command: yarn datadog-synthetics-preview
    366-
    367283
    deploy:
    368284
    docker:
    369285
    - image: cibuilds/aws:1.16.185
    @@ -379,21 +295,6 @@ jobs:
    379295
    steps:
    380296
    - trigger-docs-platform-build
    381297

    382-
    datadog-synthetics:
    383-
    executor:
    384-
    name: node/default
    385-
    tag: '14.17.3'
    386-
    description: Use Datadog CLI to run synthetic tests on production
    387-
    working_directory: *workspace_root
    388-
    steps:
    389-
    - *attach_workspace
    390-
    - node/install-packages:
    391-
    pkg-manager: yarn
    392-
    cache-version: &npm-cache-version v1 # Gets cache version from project environment variable (E.g v1)
    393-
    - run:
    394-
    name: Call Datadog CLI
    395-
    command: yarn datadog-synthetics-prod
    396-
    397298
    minimize-images:
    398299
    executor:
    399300
    name: node/default

    ‎.datadog/development.synthetics.json

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

    ‎.datadog/production.synthetics.json

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

    ‎.eslintrc.js

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

    ‎.prettierrc.js

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

    ‎README.md

    Lines changed: 0 additions & 14 deletions
    Original file line numberDiff line numberDiff line change
    @@ -50,20 +50,6 @@ see the compilation process, refer to `build_api_docs.sh` and our
    5050
    likely need to make source code changes to the API, where the docs are generated
    5151
    from.
    5252

    53-
    ### `/src-js` - Javascript Files
    54-
    55-
    Some JavaScript files that make use of Webpack and bundles a Javascript
    56-
    file that eventually gets loaded into Jekyll. Our JavaScript files are
    57-
    splintered between Jekyll's assets folder and here. We should be navigating
    58-
    toward one solution that will eventually aggregate all JS source code in one place.
    59-
    60-
    ### `/src-shared` - Shared Assets with circleci.com
    61-
    62-
    This is a *git sub-module* for shared content with the main [CircleCI
    63-
    website](https://circleci.com/docs/). The `js` folder within is symlinked into
    64-
    Jekyll's assets folder for JavaScript. Eventually, the JS here could/should be
    65-
    integrated with a better JS bundle solution per above.
    66-
    6753
    ## Testing Checklist
    6854
    To allow for more flexibility, please find the checklist inside our confluence [space](https://circleci.atlassian.net/l/c/Tm5oiCFF).
    6955

    0 commit comments

    Comments
     (0)
    0