Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The following branches have been merged: - PR 45 dependabot/npm_and_yarn/samples/weather-forecast/semver-6.3.1 (d5c0272) - PR 72 NFS-2146-weather-icon-is-missing (437fcf4) The following branches failed to merge:
- Loading branch information
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
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 |
|---|---|---|
|
|
@@ -12,18 +12,23 @@ env: | |
| DEPLOYMENT_TARGET: weather | ||
| DEPLOYMENT_STATIC_FILES: staffbase.user-profile-client.min.js | ||
| DEPLOYMENT_SOURCE: samples/weather-forecast/dist | ||
|
|
||
|
|
||
| jobs: | ||
| prepare-deployment: | ||
| name: Prepare Deployment | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| # persisting credentials breaks installing dependencies from private repos | ||
| persist-credentials: false | ||
| # fetch all history for all branches and tags | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Use Node JS | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: 'yarn' | ||
|
|
@@ -44,74 +49,122 @@ jobs: | |
| mkdir samples/weather-forecast/icons | ||
| cp samples/weather-forecast/resources/weather-forecast.svg samples/weather-forecast/dist/icons | ||
| continuous-delivery-dev-de1: | ||
| name: Continuous Delivery (dev de1) | ||
| needs: prepare-deployment | ||
| runs-on: ubuntu-22.04 | ||
| if: github.ref == 'refs/heads/dev' | ||
| steps: | ||
| - name: Deploy | ||
| uses: Staffbase/[email protected] | ||
| with: | ||
| source: ${{ env.DEPLOYMENT_SOURCE }} | ||
| deployment_kind: ${{ env.DEPLOYMENT_KIND }} | ||
| target: ${{ env.DEPLOYMENT_TARGET }} | ||
|
|
||
| # Varnish settings | ||
| static_files: ${{ env.DEPLOYMENT_STATIC_FILES }} | ||
| frontend_cache_password: ${{ secrets.FRONTEND_CACHE_DEV_DE1_PASSWORD }} | ||
| frontend_cache_host: frontend-cache-de1.staffbase.dev | ||
|
|
||
| # AWS specific settings | ||
| aws_region: eu-central-1 | ||
| aws_bucket: staffbasestatic-dev-de1 | ||
| aws_access_key_id: ${{ secrets.DEV_DE1_AWS_ACCESS_KEY_ID }} | ||
| aws_access_key_secret: ${{ secrets.DEV_DE1_AWS_ACCESS_KEY_SECRET }} | ||
|
|
||
| continuous-delivery-stage-de1: | ||
| name: Continuous Delivery (stage de1) | ||
| needs: prepare-deployment | ||
| runs-on: ubuntu-22.04 | ||
| if: github.ref == 'refs/heads/main' | ||
| steps: | ||
| - name: Deploy | ||
| uses: Staffbase/[email protected] | ||
| with: | ||
| source: ${{ env.DEPLOYMENT_SOURCE }} | ||
| deployment_kind: ${{ env.DEPLOYMENT_KIND }} | ||
| target: ${{ env.DEPLOYMENT_TARGET }} | ||
|
|
||
| # Varnish settings | ||
| static_files: ${{ env.DEPLOYMENT_STATIC_FILES }} | ||
| frontend_cache_host: frontend-cache-de1.staffbase.rocks | ||
| frontend_cache_password: ${{ secrets.FRONTEND_CACHE_STAGE_DE1_PASSWORD }} | ||
|
|
||
| # AWS specific settings | ||
| aws_bucket: staffbasestatic-stage-de1 | ||
| aws_region: eu-central-1 | ||
| aws_access_key_id: ${{ secrets.STAGE_DE1_AWS_ACCESS_KEY_ID }} | ||
| aws_access_key_secret: ${{ secrets.STAGE_DE1_AWS_ACCESS_KEY_SECRET }} | ||
|
|
||
| continuous-delivery-prod-de1: | ||
| name: Continuous Delivery (prod de1) | ||
| needs: prepare-deployment | ||
| runs-on: ubuntu-22.04 | ||
| if: startsWith(github.ref, 'refs/tags/') | ||
| steps: | ||
| - name: Deploy | ||
| uses: Staffbase/[email protected] | ||
| with: | ||
| source: ${{ env.DEPLOYMENT_SOURCE }} | ||
| deployment_kind: ${{ env.DEPLOYMENT_KIND }} | ||
| target: ${{ env.DEPLOYMENT_TARGET }} | ||
|
|
||
| # Varnish settings | ||
| static_files: ${{ env.DEPLOYMENT_STATIC_FILES }} | ||
| frontend_cache_host: frontend-cache-de1.staffbase.com | ||
| frontend_cache_password: ${{ secrets.FRONTEND_CACHE_PROD_DE1_PASSWORD }} | ||
|
|
||
| # AWS specific settings | ||
| aws_bucket: staffbasestatic-prod-de1 | ||
| aws_region: eu-central-1 | ||
| aws_access_key_id: ${{ secrets.PROD_DE1_AWS_ACCESS_KEY_ID }} | ||
| aws_access_key_secret: ${{ secrets.PROD_DE1_AWS_ACCESS_KEY_SECRET }} | ||
|
|
||
| continuous-delivery-prod-us1: | ||
| name: Continuous Delivery (prod us1) | ||
| needs: prepare-deployment | ||
| runs-on: ubuntu-22.04 | ||
| if: startsWith(github.ref, 'refs/tags/') | ||
| steps: | ||
| - name: Deploy | ||
| uses: Staffbase/[email protected] | ||
| with: | ||
| source: ${{ env.DEPLOYMENT_SOURCE }} | ||
| deployment_kind: ${{ env.DEPLOYMENT_KIND }} | ||
| target: ${{ env.DEPLOYMENT_TARGET }} | ||
|
|
||
| # Varnish settings | ||
| static_files: ${{ env.DEPLOYMENT_STATIC_FILES }} | ||
| frontend_cache_host: frontend-cache-us1.staffbase.com | ||
| frontend_cache_password: ${{ secrets.FRONTEND_CACHE_PROD_US1_PASSWORD }} | ||
|
|
||
| # AWS specific settings | ||
| aws_bucket: staffbasestatic-prod-us1 | ||
| aws_region: us-east-1 | ||
| aws_access_key_id: ${{ secrets.PROD_US1_AWS_ACCESS_KEY_ID }} | ||
| aws_access_key_secret: ${{ secrets.PROD_US1_AWS_ACCESS_KEY_SECRET }} | ||
|
|
||
| continuous-delivery-prod-au1: | ||
| name: Continuous Delivery (prod au1) | ||
| needs: prepare-deployment | ||
| runs-on: ubuntu-22.04 | ||
| if: startsWith(github.ref, 'refs/tags/') | ||
| steps: | ||
| - name: Deploy | ||
| uses: Staffbase/[email protected] | ||
| with: | ||
| source: ${{ env.DEPLOYMENT_SOURCE }} | ||
| deployment_kind: ${{ env.DEPLOYMENT_KIND }} | ||
| target: ${{ env.DEPLOYMENT_TARGET }} | ||
|
|
||
| # Varnish settings | ||
| static_files: ${{ env.DEPLOYMENT_STATIC_FILES }} | ||
| frontend_cache_host: frontend-cache-au1.staffbase.com | ||
| frontend_cache_password: ${{ secrets.FRONTEND_CACHE_PROD_AU1_PASSWORD }} | ||
|
|
||
| # AWS specific settings | ||
| aws_bucket: staffbasestatic-prod-au1 | ||
| aws_region: ap-southeast-2 | ||
| aws_access_key_id: ${{ secrets.PROD_AU1_AWS_ACCESS_KEY_ID }} | ||
| aws_access_key_secret: ${{ secrets.PROD_AU1_AWS_ACCESS_KEY_SECRET }} | ||
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
File renamed without changes
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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| declare module "*.png" { | ||
| const value: any; | ||
| export default value; | ||
| } | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
|
|
@@ -2485,11 +2485,6 @@ | |
| dependencies: | ||
| "@sinonjs/commons" "^1.7.0" | ||
|
|
||
| "@staffbase/widget-sdk@^3.3.3": | ||
| version "3.3.3" | ||
| resolved "https://registry.yarnpkg.com/@staffbase/widget-sdk/-/widget-sdk-3.3.3.tgz#79da379765dddedd76d50dbf955f01a9e3a4907f" | ||
|
|
@@ -2879,10 +2874,12 @@ | |
| resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.10.tgz#e57e2a54fc6da58da94b3571b1cb456d39f88597" | ||
| integrity sha512-TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ== | ||
|
|
||
| "@types/[email protected]": | ||
| version "20.14.2" | ||
| resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" | ||
| integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== | ||
| dependencies: | ||
| undici-types "~5.26.4" | ||
|
|
||
| "@types/parse-json@^4.0.0": | ||
| version "4.0.0" | ||
|
|
@@ -7629,14 +7626,14 @@ [email protected]: | |
| integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== | ||
|
|
||
| semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: | ||
| version "6.3.1" | ||
| resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" | ||
| integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== | ||
|
|
||
| semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: | ||
| version "7.5.4" | ||
| resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" | ||
| integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== | ||
| dependencies: | ||
| lru-cache "^6.0.0" | ||
|
|
||
|
|
@@ -8221,6 +8218,11 @@ unbox-primitive@^1.0.1: | |
| has-symbols "^1.0.2" | ||
| which-boxed-primitive "^1.0.2" | ||
|
|
||
| undici-types@~5.26.4: | ||
| version "5.26.5" | ||
| resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" | ||
| integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== | ||
|
|
||
| unicode-canonical-property-names-ecmascript@^1.0.4: | ||
| version "1.0.4" | ||
| resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" | ||
|
|
@@ -8305,6 +8307,15 @@ uri-js@^4.2.2: | |
| dependencies: | ||
| punycode "^2.1.0" | ||
|
|
||
| url-loader@^4.1.1: | ||
| version "4.1.1" | ||
| resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" | ||
| integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== | ||
| dependencies: | ||
| loader-utils "^2.0.0" | ||
| mime-types "^2.1.27" | ||
| schema-utils "^3.0.0" | ||
|
|
||
| url@^0.11.0: | ||
| version "0.11.0" | ||
| resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" | ||
|
|
||