forked from MapComplete/MapComplete
		
	Merge pull request #615 from riQQ/github-actions
Improve GitHub actions workflows
This commit is contained in:
		
						commit
						7c07d31679
					
				
					 3 changed files with 25 additions and 33 deletions
				
			
		
							
								
								
									
										21
									
								
								.github/actions/setup-and-validate/action.yml
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								.github/actions/setup-and-validate/action.yml
									
										
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,21 @@
 | 
				
			||||||
 | 
					name: "Theme Validation"
 | 
				
			||||||
 | 
					description: "Validate the themes"
 | 
				
			||||||
 | 
					runs:
 | 
				
			||||||
 | 
					  using: "composite"
 | 
				
			||||||
 | 
					  steps:
 | 
				
			||||||
 | 
					    - name: Set up Node.js
 | 
				
			||||||
 | 
					      uses: actions/setup-node@v1.4.6
 | 
				
			||||||
 | 
					      with:
 | 
				
			||||||
 | 
					        node-version: '16'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: install deps
 | 
				
			||||||
 | 
					      run: npm ci
 | 
				
			||||||
 | 
					      shell: bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: create generated dir
 | 
				
			||||||
 | 
					      run: mkdir ./assets/generated
 | 
				
			||||||
 | 
					      shell: bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: Prepare deploy
 | 
				
			||||||
 | 
					      run: npm run prepare-deploy
 | 
				
			||||||
 | 
					      shell: bash
 | 
				
			||||||
							
								
								
									
										20
									
								
								.github/workflows/deploy_pietervdvn.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.github/workflows/deploy_pietervdvn.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -8,24 +8,8 @@ jobs:
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v2
 | 
					      - uses: actions/checkout@v2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Set up Node.js
 | 
					      - name: Setup and validate themes
 | 
				
			||||||
        uses: actions/setup-node@v1.2.0
 | 
					        uses: ./.github/actions/setup-and-validate
 | 
				
			||||||
        with:
 | 
					 | 
				
			||||||
          node-version: '16'
 | 
					 | 
				
			||||||
        env:
 | 
					 | 
				
			||||||
          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: install deps
 | 
					 | 
				
			||||||
        run: npm ci
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: create generated dir
 | 
					 | 
				
			||||||
        run: mkdir ./assets/generated
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: create stub themes
 | 
					 | 
				
			||||||
        run: "echo '{\"layers\": [], \"themes\": []}' > ./assets/generated/known_layers_and_themes.json"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: Prepare deploy
 | 
					 | 
				
			||||||
        run: npm run prepare-deploy
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Clone deployment repo
 | 
					      - name: Clone deployment repo
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,21 +10,8 @@ jobs:
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v2
 | 
					      - uses: actions/checkout@v2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Set up Node.js
 | 
					      - name: Setup and validate themes
 | 
				
			||||||
        uses: actions/setup-node@v1.2.0
 | 
					        uses: ./.github/actions/setup-and-validate
 | 
				
			||||||
        with:
 | 
					 | 
				
			||||||
          node-version: '16'
 | 
					 | 
				
			||||||
        env:
 | 
					 | 
				
			||||||
          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: install deps
 | 
					 | 
				
			||||||
        run: npm ci
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: create generated dir
 | 
					 | 
				
			||||||
        run: mkdir ./assets/generated
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      - name: Prepare deploy
 | 
					 | 
				
			||||||
        run: npm run prepare-deploy
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Clone deployment repo
 | 
					      - name: Clone deployment repo
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue