-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into bugfix/#449-remove…
…-npm-lock
- Loading branch information
Showing
7 changed files
with
52 additions
and
33 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,20 +1,39 @@ | ||
| name: Website Docker Release | ||
|
|
||
| on: [ push, pull_request ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| docker: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Build and push Docker images | ||
| uses: docker/[email protected] | ||
| - name: Extract metadata (tags, labels) for Docker | ||
| id: meta | ||
| uses: docker/metadata-action@v5 | ||
| with: | ||
| images: ${{ vars.DOCKER_ORG || 'faforever' }}/faf-website | ||
| flavor: latest=false | ||
| - | ||
| name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
| - | ||
| name: Build Docker Image | ||
| uses: docker/build-push-action@v5 | ||
| - | ||
| name: Login to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| if: ${{ github.ref_name == 'develop' || startsWith(github.ref, 'refs/tags') }} | ||
| with: | ||
| username: ${{ secrets.DOCKER_USERNAME }} | ||
| password: ${{ secrets.DOCKER_PASSWORD }} | ||
| repository: faforever/faf-website | ||
| push: ${{ github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags') }} | ||
| tag_with_ref: true | ||
| - | ||
| name: Push Docker Image | ||
| uses: docker/build-push-action@v5 | ||
| if: ${{ github.ref_name == 'develop' || startsWith(github.ref, 'refs/tags') }} | ||
| with: | ||
| push: true | ||
| tags: ${{ steps.meta.outputs.tags }} | ||
| labels: ${{ steps.meta.outputs.labels }} |
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
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 |
|---|---|---|
|
|
@@ -1926,10 +1926,10 @@ mkdirp@~1.0.4: | |
| resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" | ||
| integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== | ||
|
|
||
| [email protected].34: | ||
| version "0.5.34" | ||
| resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz" | ||
| integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== | ||
| [email protected].35: | ||
| version "0.5.35" | ||
| resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.35.tgz#6fa2631bdbe8ff04f6b8753f7199516be6dc9839" | ||
| integrity sha512-cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw== | ||
| dependencies: | ||
| moment ">= 2.9.0" | ||
|
|
||
|
|
@@ -1959,10 +1959,10 @@ multimatch@^4.0.0: | |
| arrify "^2.0.1" | ||
| minimatch "^3.0.4" | ||
|
|
||
| nanoid@^3.3.4: | ||
| version "3.3.4" | ||
| resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz" | ||
| integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== | ||
| nanoid@^3.3.6: | ||
| version "3.3.6" | ||
| resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" | ||
| integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== | ||
|
|
||
| [email protected]: | ||
| version "0.6.3" | ||
|
|
@@ -2395,12 +2395,12 @@ postcss@^6.0.11: | |
| source-map "^0.6.1" | ||
| supports-color "^5.4.0" | ||
|
|
||
| postcss@^8.4.14: | ||
| version "8.4.18" | ||
| resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz" | ||
| integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA== | ||
| postcss@^8.4.31: | ||
| version "8.4.31" | ||
| resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" | ||
| integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== | ||
| dependencies: | ||
| nanoid "^3.3.4" | ||
| nanoid "^3.3.6" | ||
| picocolors "^1.0.0" | ||
| source-map-js "^1.0.2" | ||
|
|
||
|
|
||