Revert to only using workflows

3 files changed, 99 insertions, 63 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f0211e9..60e01530 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,54 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-        - uses: actions/checkout@v1
-        - uses: ./.github/workflows/ci/
+      # Initialization
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+      - run: npm install
+      - name: Copy configuration
+        run: cp config.json.example config.json
+
+      # Create Chrome artifacts
+      - name: Create Chrome artifacts
+        run: npm run build:chrome
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ChromeExtension
+          path: dist
+      - run: mkdir ./builds
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/ChromeExtension.zip ./dist
+
+      # Create Firefox artifacts
+      - name: Create Firefox artifacts
+        run: npm run build:firefox
+      - uses: actions/upload-artifact@v1
+        with:
+          name: FirefoxExtension
+          path: dist
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/FirefoxExtension.zip ./dist
+
+      # Create Beta artifacts (Builds with the name changed to beta)
+      - name: Create Chrome Beta artifacts
+        run: npm run build:chrome -- --env.stream=beta
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ChromeExtensionBeta
+          path: dist
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist
+
+      - name: Create Firefox Beta artifacts
+        run: npm run build:firefox -- --env.stream=beta
+      - uses: actions/upload-artifact@v1
+        with:
+          name: FirefoxExtensionBeta
+          path: dist
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist
 
diff --git a/.github/workflows/ci/action.yml b/.github/workflows/ci/action.yml
deleted file mode 100644
index b2ac5b87..00000000
--- a/.github/workflows/ci/action.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: CI
-
-runs:
-  name: Create artifacts
-  runs-on: ubuntu-latest
-
-  steps:
-    # Initialization
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
-    - run: npm install
-    - name: Copy configuration
-      run: cp config.json.example config.json
-
-    # Create Chrome artifacts
-    - name: Create Chrome artifacts
-      run: npm run build:chrome
-    - uses: actions/upload-artifact@v1
-      with:
-        name: ChromeExtension
-        path: dist
-    - run: mkdir ./builds
-    - uses: montudor/[email protected]
-      with:
-        args: zip -qq -r ./builds/ChromeExtension.zip ./dist
-
-    # Create Firefox artifacts
-    - name: Create Firefox artifacts
-      run: npm run build:firefox
-    - uses: actions/upload-artifact@v1
-      with:
-        name: FirefoxExtension
-        path: dist
-    - uses: montudor/[email protected]
-      with:
-        args: zip -qq -r ./builds/FirefoxExtension.zip ./dist
-
-    # Create Beta artifacts (Builds with the name changed to beta)
-    - name: Create Chrome Beta artifacts
-      run: npm run build:chrome -- --env.stream=beta
-    - uses: actions/upload-artifact@v1
-      with:
-        name: ChromeExtensionBeta
-        path: dist
-    - uses: montudor/[email protected]
-      with:
-        args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist
-
-    - name: Create Firefox Beta artifacts
-      run: npm run build:firefox -- --env.stream=beta
-    - uses: actions/upload-artifact@v1
-      with:
-        name: FirefoxExtensionBeta
-        path: dist
-    - uses: montudor/[email protected]
-      with:
-        args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8ee5baf0..2e6d2a33 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,10 +9,56 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # Build Artifacts
+      # Initialization
       - uses: actions/checkout@v1
-      - name: Build Artifacts
-        uses: ./.github/workflows/ci/
+      - uses: actions/setup-node@v1
+      - run: npm install
+      - name: Copy configuration
+        run: cp config.json.example config.json
+
+      # Create Chrome artifacts
+      - name: Create Chrome artifacts
+        run: npm run build:chrome
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ChromeExtension
+          path: dist
+      - run: mkdir ./builds
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/ChromeExtension.zip ./dist
+
+      # Create Firefox artifacts
+      - name: Create Firefox artifacts
+        run: npm run build:firefox
+      - uses: actions/upload-artifact@v1
+        with:
+          name: FirefoxExtension
+          path: dist
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/FirefoxExtension.zip ./dist
+
+      # Create Beta artifacts (Builds with the name changed to beta)
+      - name: Create Chrome Beta artifacts
+        run: npm run build:chrome -- --env.stream=beta
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ChromeExtensionBeta
+          path: dist
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist
+
+      - name: Create Firefox Beta artifacts
+        run: npm run build:firefox -- --env.stream=beta
+      - uses: actions/upload-artifact@v1
+        with:
+          name: FirefoxExtensionBeta
+          path: dist
+      - uses: montudor/[email protected]
+        with:
+          args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist
 
       # Upload each release asset
       - name: Upload to release