-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
resolved conflicts for main to develop pull (#366)
- Loading branch information
1 parent
516c87e
commit f602860
Showing
10 changed files
with
403 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| FEEDBACK_CONTENT_SET_ID= | ||
| FEEDBACK_CONTENT_SET_ID= | ||
| HOTJAR_ID=abc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| # This workflow uses actions that are not certified by GitHub. | ||
| # They are provided by a third-party and are governed by | ||
| # separate terms of service, privacy policy, and support | ||
| # documentation. | ||
|
|
||
| # GitHub recommends pinning actions to a commit SHA. | ||
| # To get a newer version, you will need to update the SHA. | ||
| # You can also reference a tag or branch, but the action may change without warning. | ||
|
|
||
| name: Publish Docker image | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build and Push Docker image to Docker Hub | ||
| runs-on: ubuntu-latest | ||
| environment: ${{ github.ref == 'refs/heads/main' && 'production' || 'development' }} | ||
| permissions: | ||
| contents: read | ||
| steps: | ||
| - name: Check out the repo | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 18 | ||
| cache: 'npm' | ||
|
|
||
| - run: npm install | ||
| - name: create env file | ||
| run: | | ||
| touch .env | ||
| echo TYPESENSE_COLLECTION_NAME=${{ vars.TYPESENSE_COLLECTION_NAME }} >> .env | ||
| echo TYPESENSE_SERVER_HOST=${{ vars.TYPESENSE_SERVER_HOST }} >> .env | ||
| echo TYPESENSE_SEARCH_ONLY_APIKEY=${{ vars.TYPESENSE_SEARCH_ONLY_APIKEY }} >> .env | ||
| echo HOTJAR_ID=${{ vars.HOTJAR_ID }} >> .env | ||
| - run: npm run build | ||
|
|
||
| - name: Log in to Docker Hub | ||
| uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a | ||
| with: | ||
| username: ${{ secrets.DOCKER_USERNAME }} | ||
| password: ${{ secrets.DOCKER_PASSWORD }} | ||
|
|
||
| - name: Extract metadata (tags, labels) for Docker | ||
| id: meta | ||
| uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 | ||
| with: | ||
| images: ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }} | ||
| tags: | | ||
| type=sha | ||
| # set latest tag for default branch | ||
| type=raw,value=latest,enable={{is_default_branch}} | ||
| - name: Build and push Docker image | ||
| id: push | ||
| uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 | ||
| with: | ||
| context: . | ||
| file: ./Dockerfile | ||
| push: true | ||
| tags: ${{ steps.meta.outputs.tags }} | ||
| labels: ${{ steps.meta.outputs.labels }} | ||
|
|
||
| - name: Set short git commit SHA | ||
| id: vars | ||
| run: | | ||
| calculatedSha=$(git rev-parse --short ${{ github.sha }}) | ||
| echo "short_sha=$calculatedSha" >> "$GITHUB_OUTPUT" | ||
| - name: Deploy | ||
| uses: actions/github-script@v6 | ||
| with: | ||
| github-token: ${{ secrets.WORKFLOW_DISPATCH }} | ||
| script: | | ||
| await github.rest.actions.createWorkflowDispatch({ | ||
| owner: 'poc-aaa', | ||
| repo: 'devops', | ||
| workflow_id: 'deploy.yaml', | ||
| ref: 'main', | ||
| inputs: { | ||
| env: '${{ github.ref == 'refs/heads/main' && 'production' || 'development' }}', | ||
| appName: 'docs', | ||
| appProject: 'aelf-docs', | ||
| commit_sha: 'sha-${{ steps.vars.outputs.short_sha }}', | ||
| } | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,7 +35,6 @@ const config: Config = { | |
| defaultLocale: "en", | ||
| locales: ["en"], | ||
| }, | ||
|
|
||
| presets: [ | ||
| [ | ||
| "classic", | ||
|
|
||
Oops, something went wrong.