Skip to content

Commit

Permalink
Merge branch 'main' into releases/v1
Browse files Browse the repository at this point in the history
  • Loading branch information
sarisia committed Aug 6, 2022
2 parents 6874d09 + 3dcab30 commit df2e816
Show file tree
Hide file tree
Showing 11 changed files with 3,570 additions and 4,125 deletions.
3 changes: 0 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
ARG VARIANT="14-buster"
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}

COPY library-scripts/fish-debian.sh /tmp/library-scripts/
RUN apt-get update && bash /tmp/library-scripts/fish-debian.sh

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>
Expand Down
19 changes: 7 additions & 12 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,23 @@
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 10, 12, 14
"args": { "VARIANT": "16-bullseye" }
"args": {
"VARIANT": "16-bullseye"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
},

"settings": {},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "npm i",

// "postCreateCommand": "npm i",
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node",

"features": {
// "fish": "latest"
"fish": "latest"
}
}
}
96 changes: 0 additions & 96 deletions .devcontainer/library-scripts/fish-debian.sh

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/demo.yml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/dry-run-full.yml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/releases-v1-fixed.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,45 +1,64 @@
name: "dry-run (universal)"
name: "run-releases-branch-remote"
on:
workflow_dispatch:
push:
branches-ignore:
- 'releases/**'
pull_request:
branches:
- "releases/v1"
tags-ignore:
- "**"
concurrency:
group: ${{ github.workflow }}-${{ github.sha }}
cancel-in-progress: true

jobs:
dryrun:
run:
strategy:
max-parallel: 2 # to avoid discord webhook's rate limit
matrix:
os:
- ubuntu-latest
- ubuntu-22.04
- ubuntu-20.04
- ubuntu-18.04
- macos-latest
- macos-11
- macos-10.15
- windows-latest
- windows-2022
- windows-2019
- macos-latest
- macos-12
- macos-11

runs-on: ${{ matrix.os }}
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_VERBOSE }}
steps:
- uses: actions/checkout@v2
- uses: actions/[email protected]
- name: run simple
# do not reference as local action! (runs: ./)
uses: sarisia/actions-status-discord@releases/v1

- name: run full
uses: sarisia/actions-status-discord@releases/v1
with:
node-version: '12.x'
- name: build
run: npm run release
- name: run
uses: ./
status: Failure
title: "${{ github.workflow }} - ${{ matrix.os }} - must failure"
description: "testing `releases/v1` branch"
nofail: false
nodetail: false
image: "https://user-images.githubusercontent.com/33576079/81886735-69e03f80-95d8-11ea-8828-fa10dda8afd1.png"
color: 0xFFFFFF
username: GitHub Actions
avatar_url: ${{ secrets.AVATAR_URL }}

- name: run nodetail
uses: sarisia/actions-status-discord@releases/v1
with:
title: dry run (${{ matrix.os }})
status: Cancelled
title: "${{ github.workflow }} - ${{ matrix.os }} - no details"
nodetail: true
nofail: false

conclusion:
runs-on: ubuntu-latest
needs: dryrun
needs: run
if: always()
steps:
- uses: actions/github-script@v3
Expand All @@ -58,6 +77,7 @@ jobs:
return jobs.filter(job => job.conclusion !== null && job.conclusion !== "success")
.length > 0 ? 'failure' : 'success'
- uses: sarisia/actions-status-discord@v1
if: always()
with:
webhook: ${{ secrets.DISCORD_WEBHOOK }}
status: ${{ steps.ghapi.outputs.result }}
Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,26 @@ on:
jobs:
test:
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- uses: actions/checkout@v2
- uses: actions/[email protected]
- uses: actions/checkout@v3

- uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ github.token }}

- uses: devcontainers/[email protected]
with:
node-version: '12.x'
- run: npm ci
- run: npm test
- run: npm run release
imageName: ghcr.io/${{ github.repository }}/devcontainers-ci
refFilterForPush: refs/heads/main
runCmd: |
npm ci
npm test
npm run release
- uses: sarisia/actions-status-discord@v1
if: always()
with:
Expand Down
Loading

0 comments on commit df2e816

Please sign in to comment.