Skip to content

Commit

Permalink
Merge branch 'development' into internal-backpack
Browse files Browse the repository at this point in the history
  • Loading branch information
idinium96 committed Aug 1, 2023
2 parents a8c5d63 + a4adb3f commit ad503bf
Show file tree
Hide file tree
Showing 7 changed files with 851 additions and 978 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]

steps:
- uses: actions/[email protected]
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v3.7.0
with:
node-version: ${{ matrix.node-version }}
- run: npm install
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/docker-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ jobs:
strategy:
matrix:
node:
- 16.15.0-alpine
- 16.15.0-buster
- 16.15.0-buster-slim
- 16.15.0-stretch
- 16.15.0-stretch-slim
- 18.17.0-alpine
- 18.17.0-buster
- 18.17.0-buster-slim

name: Tag Commit (node:${{ matrix.node }})

Expand All @@ -34,7 +32,7 @@ jobs:
uses: docker/[email protected]

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.7.0
uses: docker/setup-buildx-action@v2.9.1

- name: Login to DockerHub
uses: docker/[email protected]
Expand All @@ -43,7 +41,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build final image
uses: docker/build-push-action@v4.0.0
uses: docker/build-push-action@v4.1.1
with:
push: true
tags: tf2autobot/tf2autobot:${{ github.sha }}-${{ matrix.node }}
12 changes: 5 additions & 7 deletions .github/workflows/docker-latest-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ jobs:
strategy:
matrix:
node:
- 16.15.0-alpine
- 16.15.0-buster
- 16.15.0-buster-slim
- 16.15.0-stretch
- 16.15.0-stretch-slim
- 18.17.0-alpine
- 18.17.0-buster
- 18.17.0-buster-slim

name: Tag Latest (node:${{ matrix.node }})

Expand All @@ -36,7 +34,7 @@ jobs:
uses: docker/[email protected]

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.7.0
uses: docker/setup-buildx-action@v2.9.1

- name: Login to DockerHub
uses: docker/[email protected]
Expand All @@ -45,7 +43,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build final image
uses: docker/build-push-action@v4.0.0
uses: docker/build-push-action@v4.1.1
with:
push: true
tags: tf2autobot/tf2autobot:latest-${{ matrix.node }}
12 changes: 5 additions & 7 deletions .github/workflows/docker-release.tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ jobs:
strategy:
matrix:
node:
- 16.15.0-alpine
- 16.15.0-buster
- 16.15.0-buster-slim
- 16.15.0-stretch
- 16.15.0-stretch-slim
- 18.17.0-alpine
- 18.17.0-buster
- 18.17.0-buster-slim

name: Tag Release (node:${{ matrix.node }})

Expand All @@ -37,7 +35,7 @@ jobs:
uses: docker/[email protected]

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.7.0
uses: docker/setup-buildx-action@v2.9.1

- name: Login to DockerHub
uses: docker/[email protected]
Expand All @@ -47,7 +45,7 @@ jobs:

- name: Build and push (node:${{ matrix.node }})
id: docker
uses: docker/build-push-action@v4.0.0
uses: docker/build-push-action@v4.1.1
with:
push: true
context: .
Expand Down
Loading

0 comments on commit ad503bf

Please sign in to comment.